Author: ate
Date: Tue May 12 13:54:16 2009
New Revision: 773899
URL: http://svn.apache.org/viewvc?rev=773899&view=rev
Log:
PORTALS-14: Rearrange and update portlet specs svn
Replacing the predefined maven-assembly project descriptor as defined in
portals-pom with a custom descriptor for each (root) project.
The predefined assembly descriptors all have the limitation that you can't add
includes/excludes, making them pretty useless imo.
Added:
portals/portlet-spec/trunk/portlet-api-1.0/src/main/assembly/
portals/portlet-spec/trunk/portlet-api-1.0/src/main/assembly/project.xml
(with props)
portals/portlet-spec/trunk/portlet-api-2.0/src/main/assembly/
portals/portlet-spec/trunk/portlet-api-2.0/src/main/assembly/project.xml
(with props)
Modified:
portals/portals-pom/trunk/pom.xml
portals/portlet-spec/trunk/portlet-api-1.0/pom.xml
portals/portlet-spec/trunk/portlet-api-2.0/pom.xml
Modified: portals/portals-pom/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/portals/portals-pom/trunk/pom.xml?rev=773899&r1=773898&r2=773899&view=diff
==============================================================================
--- portals/portals-pom/trunk/pom.xml (original)
+++ portals/portals-pom/trunk/pom.xml Tue May 12 13:54:16 2009
@@ -11,7 +11,9 @@
or agreed to in writing, software distributed under the License is
distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the specific language
- governing permissions and limitations under the License. $Id:
+ governing permissions and limitations under the License.
+
+ $Id$
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
@@ -79,6 +81,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/project.xml</descriptor>
+ </descriptors>
+ </configuration>
</plugin>
</plugins>
</build>
@@ -91,11 +98,7 @@
<artifactId>maven-assembly-plugin</artifactId>
<!-- version 2.2-beta-3 does not work, see
http://jira.codehaus.org/browse/MASSEMBLY-405 -->
<version>2.2-beta-2</version>
- <configuration>
- <descriptorRefs>
- <descriptorRef>project</descriptorRef>
- </descriptorRefs>
- </configuration>
+ <!-- no predefined project assembly here as it is too limiting: each
root project should configure a custom assembly -->
<executions>
<execution>
<id>make-assembly</id>
Modified: portals/portlet-spec/trunk/portlet-api-1.0/pom.xml
URL:
http://svn.apache.org/viewvc/portals/portlet-spec/trunk/portlet-api-1.0/pom.xml?rev=773899&r1=773898&r2=773899&view=diff
==============================================================================
--- portals/portlet-spec/trunk/portlet-api-1.0/pom.xml (original)
+++ portals/portlet-spec/trunk/portlet-api-1.0/pom.xml Tue May 12 13:54:16 2009
@@ -16,6 +16,8 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
+
+ $Id$
-->
@@ -87,6 +89,11 @@
<!-- only include this in top level project poms -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/project.xml</descriptor>
+ </descriptors>
+ </configuration>
</plugin>
</plugins>
</build>
Added: portals/portlet-spec/trunk/portlet-api-1.0/src/main/assembly/project.xml
URL:
http://svn.apache.org/viewvc/portals/portlet-spec/trunk/portlet-api-1.0/src/main/assembly/project.xml?rev=773899&view=auto
==============================================================================
--- portals/portlet-spec/trunk/portlet-api-1.0/src/main/assembly/project.xml
(added)
+++ portals/portlet-spec/trunk/portlet-api-1.0/src/main/assembly/project.xml
Tue May 12 13:54:16 2009
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with this
+ work for additional information regarding copyright ownership. The ASF
+ licenses this file to You under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
+ or agreed to in writing, software distributed under the License is
+ distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the specific language
+ governing permissions and limitations under the License.
+
+ $Id$
+-->
+<assembly>
+ <id>project</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>tar.bz2</format>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory></outputDirectory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ <exclude>.*/**</exclude>
+ <exclude>*.log*</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange:
portals/portlet-spec/trunk/portlet-api-1.0/src/main/assembly/project.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
portals/portlet-spec/trunk/portlet-api-1.0/src/main/assembly/project.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange:
portals/portlet-spec/trunk/portlet-api-1.0/src/main/assembly/project.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: portals/portlet-spec/trunk/portlet-api-2.0/pom.xml
URL:
http://svn.apache.org/viewvc/portals/portlet-spec/trunk/portlet-api-2.0/pom.xml?rev=773899&r1=773898&r2=773899&view=diff
==============================================================================
--- portals/portlet-spec/trunk/portlet-api-2.0/pom.xml (original)
+++ portals/portlet-spec/trunk/portlet-api-2.0/pom.xml Tue May 12 13:54:16 2009
@@ -16,6 +16,8 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
+
+ $Id$
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
@@ -99,6 +101,11 @@
<!-- only include this in top level project poms -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/project.xml</descriptor>
+ </descriptors>
+ </configuration>
</plugin>
</plugins>
</build>
Added: portals/portlet-spec/trunk/portlet-api-2.0/src/main/assembly/project.xml
URL:
http://svn.apache.org/viewvc/portals/portlet-spec/trunk/portlet-api-2.0/src/main/assembly/project.xml?rev=773899&view=auto
==============================================================================
--- portals/portlet-spec/trunk/portlet-api-2.0/src/main/assembly/project.xml
(added)
+++ portals/portlet-spec/trunk/portlet-api-2.0/src/main/assembly/project.xml
Tue May 12 13:54:16 2009
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with this
+ work for additional information regarding copyright ownership. The ASF
+ licenses this file to You under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
+ or agreed to in writing, software distributed under the License is
+ distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the specific language
+ governing permissions and limitations under the License.
+
+ $Id$
+-->
+<assembly>
+ <id>project</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>tar.bz2</format>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory></outputDirectory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ <exclude>.*/**</exclude>
+ <exclude>*.log*</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange:
portals/portlet-spec/trunk/portlet-api-2.0/src/main/assembly/project.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
portals/portlet-spec/trunk/portlet-api-2.0/src/main/assembly/project.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange:
portals/portlet-spec/trunk/portlet-api-2.0/src/main/assembly/project.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
