portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r512129 [1/3] - in /portals/jetspeed-2/trunk: ./ ant-tasks/ app-servers/ applications/ applications/demo/ applications/gems/ applications/j2-admin/ applications/rss/ applications/rss/rss-jar/ applications/rss/rss-war/ commons/ components/ c...
Date Tue, 27 Feb 2007 04:11:50 GMT
Author: ate
Date: Mon Feb 26 20:11:47 2007
New Revision: 512129

URL: http://svn.apache.org/viewvc?view=rev&rev=512129
Log:
Release 2.1 preparation:
- bump all versions to 2.1, and all bridges deps to 1.0.1
- ensure LICENSE.TXT is in the jars for maven-1 based builds

Added:
    portals/jetspeed-2/trunk/ant-tasks/project.properties   (with props)
    portals/jetspeed-2/trunk/commons/project.properties   (with props)
Modified:
    portals/jetspeed-2/trunk/.classpath
    portals/jetspeed-2/trunk/ant-tasks/pom.xml
    portals/jetspeed-2/trunk/app-servers/pom.xml
    portals/jetspeed-2/trunk/applications/demo/pom.xml
    portals/jetspeed-2/trunk/applications/demo/project.xml
    portals/jetspeed-2/trunk/applications/gems/pom.xml
    portals/jetspeed-2/trunk/applications/j2-admin/pom.xml
    portals/jetspeed-2/trunk/applications/j2-admin/project.xml
    portals/jetspeed-2/trunk/applications/pom.xml
    portals/jetspeed-2/trunk/applications/rss/pom.xml
    portals/jetspeed-2/trunk/applications/rss/project.properties
    portals/jetspeed-2/trunk/applications/rss/project.xml
    portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml
    portals/jetspeed-2/trunk/applications/rss/rss-war/pom.xml
    portals/jetspeed-2/trunk/commons/pom.xml
    portals/jetspeed-2/trunk/components/capability/pom.xml
    portals/jetspeed-2/trunk/components/cm/pom.xml
    portals/jetspeed-2/trunk/components/deploy-tool/pom.xml
    portals/jetspeed-2/trunk/components/deploy-tool/project.properties
    portals/jetspeed-2/trunk/components/file-cache/pom.xml
    portals/jetspeed-2/trunk/components/header-resource/pom.xml
    portals/jetspeed-2/trunk/components/id-generator/pom.xml
    portals/jetspeed-2/trunk/components/jetspeed/pom.xml
    portals/jetspeed-2/trunk/components/locator/pom.xml
    portals/jetspeed-2/trunk/components/page-manager/pom.xml
    portals/jetspeed-2/trunk/components/pom.xml
    portals/jetspeed-2/trunk/components/portal-site/pom.xml
    portals/jetspeed-2/trunk/components/portal/pom.xml
    portals/jetspeed-2/trunk/components/portlet-factory/pom.xml
    portals/jetspeed-2/trunk/components/prefs/pom.xml
    portals/jetspeed-2/trunk/components/profiler/pom.xml
    portals/jetspeed-2/trunk/components/rdbms/pom.xml
    portals/jetspeed-2/trunk/components/registry/pom.xml
    portals/jetspeed-2/trunk/components/rewriter/pom.xml
    portals/jetspeed-2/trunk/components/search/pom.xml
    portals/jetspeed-2/trunk/components/security-schema/pom.xml
    portals/jetspeed-2/trunk/components/security/pom.xml
    portals/jetspeed-2/trunk/components/serializer/pom.xml
    portals/jetspeed-2/trunk/components/sso/pom.xml
    portals/jetspeed-2/trunk/components/statistics/pom.xml
    portals/jetspeed-2/trunk/components/web-content/pom.xml
    portals/jetspeed-2/trunk/components/webapp-logging/pom.xml
    portals/jetspeed-2/trunk/enterprise/ear-full/pom.xml
    portals/jetspeed-2/trunk/enterprise/ear-min/pom.xml
    portals/jetspeed-2/trunk/enterprise/pom.xml
    portals/jetspeed-2/trunk/etc/import/pom.xml
    portals/jetspeed-2/trunk/etc/pom.xml
    portals/jetspeed-2/trunk/jetspeed-api/pom.xml
    portals/jetspeed-2/trunk/layout-portlets/layout-portlets-jar/pom.xml
    portals/jetspeed-2/trunk/layout-portlets/layout-portlets-war/pom.xml
    portals/jetspeed-2/trunk/layout-portlets/pom.xml
    portals/jetspeed-2/trunk/layout-portlets/project.xml
    portals/jetspeed-2/trunk/maven-archetypes/application/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/component/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/portal-component/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/portal-resources/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/portal/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/shared-component/pom.xml
    portals/jetspeed-2/trunk/maven-plugin/plugin.properties
    portals/jetspeed-2/trunk/maven-plugin/project.xml
    portals/jetspeed-2/trunk/maven.xml
    portals/jetspeed-2/trunk/pom.xml
    portals/jetspeed-2/trunk/portal/pom.xml
    portals/jetspeed-2/trunk/project.properties
    portals/jetspeed-2/trunk/project.xml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/conf/jetspeed.properties
    portals/jetspeed-2/trunk/taglibs/pom.xml
    portals/jetspeed-2/trunk/taglibs/treecontrol/pom.xml
    portals/jetspeed-2/trunk/tutorial/xdocs/01/genapp.xml
    portals/jetspeed-2/trunk/tutorial/xdocs/03/portlet-app.xml
    portals/jetspeed-2/trunk/xdocs/getting-started-binary.xml
    portals/jetspeed-2/trunk/xdocs/getting-started-source.xml

Modified: portals/jetspeed-2/trunk/.classpath
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/.classpath?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/.classpath (original)
+++ portals/jetspeed-2/trunk/.classpath Mon Feb 26 20:11:47 2007
@@ -105,11 +105,11 @@
 	<classpathentry kind="var" path="MAVEN_REPO/org.springframework/jars/spring-webmvc-2.0.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/springmodules/jars/spring-modules-ojb-0.6.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/commons-fileupload/jars/commons-fileupload-1.0.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/org.apache.portals.bridges/jars/portals-bridges-common-1.0.1-dev.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/org.apache.portals.bridges/jars/portals-bridges-frameworks-1.0.1-dev.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/org.apache.portals.bridges/jars/portals-bridges-jsf-1.0.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/org.apache.portals.bridges/jars/portals-bridges-velocity-1.0.1-dev.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/org.apache.portals.bridges/jars/portals-bridges-portletfilter-1.0.1-dev.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/org.apache.portals.bridges/jars/portals-bridges-common-1.0.1.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/org.apache.portals.bridges/jars/portals-bridges-frameworks-1.0.1.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/org.apache.portals.bridges/jars/portals-bridges-jsf-1.0.1.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/org.apache.portals.bridges/jars/portals-bridges-velocity-1.0.1.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/org.apache.portals.bridges/jars/portals-bridges-portletfilter-1.0.1.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/activation/jars/activation-1.0.2.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/javamail/jars/javamail-1.3.3.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/taglibs/jars/random-1.0.2.jar"/>

Modified: portals/jetspeed-2/trunk/ant-tasks/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/ant-tasks/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/ant-tasks/pom.xml (original)
+++ portals/jetspeed-2/trunk/ant-tasks/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>jetspeed-2</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Added: portals/jetspeed-2/trunk/ant-tasks/project.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/ant-tasks/project.properties?view=auto&rev=512129
==============================================================================
--- portals/jetspeed-2/trunk/ant-tasks/project.properties (added)
+++ portals/jetspeed-2/trunk/ant-tasks/project.properties Mon Feb 26 20:11:47 2007
@@ -0,0 +1,20 @@
+# Copyright 2004 The Apache Software Foundation
+#
+# Licensed 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$
+#
+
+maven.multiproject.type=jar
+maven.license.licenseFile=${basedir}/../LICENSE.TXT
+

Propchange: portals/jetspeed-2/trunk/ant-tasks/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/ant-tasks/project.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: portals/jetspeed-2/trunk/app-servers/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/app-servers/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/app-servers/pom.xml (original)
+++ portals/jetspeed-2/trunk/app-servers/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>jetspeed-2</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

Modified: portals/jetspeed-2/trunk/applications/demo/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/demo/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/applications/demo/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/demo/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>applications</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>war</packaging>

Modified: portals/jetspeed-2/trunk/applications/demo/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/demo/project.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/applications/demo/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/demo/project.xml Mon Feb 26 20:11:47 2007
@@ -299,4 +299,22 @@
         
     </dependencies>
     
+    <build>
+        <sourceDirectory>src/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>${basedir}/src/java</directory>
+                <excludes>
+                    <exclude>**/*.java</exclude>
+                </excludes>
+            </resource>
+            <resource>
+                <directory>${basedir}/../../</directory>
+                <targetPath>../${pom.artifactId}/META-INF</targetPath>
+                <includes>
+                    <include>LICENSE.TXT</include>
+                </includes>
+            </resource>
+        </resources>
+    </build>
 </project>

Modified: portals/jetspeed-2/trunk/applications/gems/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/gems/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/applications/gems/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/gems/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>applications</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/applications/j2-admin/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>applications</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>war</packaging>

Modified: portals/jetspeed-2/trunk/applications/j2-admin/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/project.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/project.xml Mon Feb 26 20:11:47 2007
@@ -413,4 +413,23 @@
         
     </dependencies>
 
+    <build>
+        <sourceDirectory>src/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>${basedir}/src/java</directory>
+                <excludes>
+                    <exclude>**/*.java</exclude>
+                </excludes>
+            </resource>
+            <resource>
+                <directory>${basedir}/../../</directory>
+                <targetPath>../${pom.artifactId}/META-INF</targetPath>
+                <includes>
+                    <include>LICENSE.TXT</include>
+                </includes>
+            </resource>
+        </resources>
+    </build>
+    
 </project>

Modified: portals/jetspeed-2/trunk/applications/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/applications/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>jetspeed-2</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

Modified: portals/jetspeed-2/trunk/applications/rss/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/rss/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/applications/rss/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/rss/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>applications</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

Modified: portals/jetspeed-2/trunk/applications/rss/project.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/rss/project.properties?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/applications/rss/project.properties (original)
+++ portals/jetspeed-2/trunk/applications/rss/project.properties Mon Feb 26 20:11:47 2007
@@ -16,6 +16,6 @@
 #
 
 maven.multiproject.type=war
-
+maven.license.licenseFile=${basedir}/../../LICENSE.TXT
 org.apache.jetspeed.portlet.app.name=rss
 maven.war.final.name=rss.war

Modified: portals/jetspeed-2/trunk/applications/rss/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/rss/project.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/applications/rss/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/rss/project.xml Mon Feb 26 20:11:47 2007
@@ -170,4 +170,24 @@
           </properties>
         </dependency>
 	</dependencies>
+
+	<build>
+		<sourceDirectory>src/java</sourceDirectory>
+		<resources>
+			<resource>
+				<directory>${basedir}/src/java</directory>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
+			</resource>
+			<resource>
+				<directory>${basedir}/../../</directory>
+				<targetPath>../${pom.artifactId}/META-INF</targetPath>
+				<includes>
+					<include>LICENSE.TXT</include>
+				</includes>
+			</resource>
+		</resources>
+	</build>
+	
 </project>

Modified: portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>rss-applications</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/applications/rss/rss-war/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/rss/rss-war/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/applications/rss/rss-war/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/rss/rss-war/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>rss-applications</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>war</packaging>

Modified: portals/jetspeed-2/trunk/commons/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/commons/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/commons/pom.xml (original)
+++ portals/jetspeed-2/trunk/commons/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>jetspeed-2</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Added: portals/jetspeed-2/trunk/commons/project.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/commons/project.properties?view=auto&rev=512129
==============================================================================
--- portals/jetspeed-2/trunk/commons/project.properties (added)
+++ portals/jetspeed-2/trunk/commons/project.properties Mon Feb 26 20:11:47 2007
@@ -0,0 +1,20 @@
+# Copyright 2004 The Apache Software Foundation
+#
+# Licensed 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$
+#
+
+maven.multiproject.type=jar
+maven.license.licenseFile=${basedir}/../LICENSE.TXT
+

Propchange: portals/jetspeed-2/trunk/commons/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/commons/project.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: portals/jetspeed-2/trunk/components/capability/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/capability/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/components/capability/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/capability/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/cm/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/cm/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/deploy-tool/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/deploy-tool/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/components/deploy-tool/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/deploy-tool/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/deploy-tool/project.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/deploy-tool/project.properties?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/components/deploy-tool/project.properties (original)
+++ portals/jetspeed-2/trunk/components/deploy-tool/project.properties Mon Feb 26 20:11:47 2007
@@ -16,3 +16,5 @@
 #
 
 maven.uberjar.main  org.apache.jetspeed.tools.deploy.JetspeedDeploy
+maven.multiproject.type=jar
+maven.license.licenseFile=${basedir}/../../LICENSE.TXT

Modified: portals/jetspeed-2/trunk/components/file-cache/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/file-cache/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/components/file-cache/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/file-cache/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/header-resource/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/header-resource/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/components/header-resource/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/header-resource/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/id-generator/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/id-generator/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/components/id-generator/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/id-generator/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/jetspeed/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/jetspeed/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/locator/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/locator/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/components/locator/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/locator/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/page-manager/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/page-manager/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/components/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>jetspeed-2</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

Modified: portals/jetspeed-2/trunk/components/portal-site/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal-site/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/components/portal-site/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/portal-site/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/portal/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/portlet-factory/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portlet-factory/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/components/portlet-factory/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/portlet-factory/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/prefs/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/prefs/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/components/prefs/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/prefs/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/profiler/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/profiler/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/components/profiler/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/profiler/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/rdbms/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/rdbms/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/components/rdbms/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/rdbms/pom.xml Mon Feb 26 20:11:47 2007
@@ -1,130 +1,130 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright 2006 The Apache Software Foundation
-
-Licensed 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:$
--->
-<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">
-
-    <modelVersion>4.0.0</modelVersion>
-    <prerequisites>
-        <maven>2.0.4</maven>
-    </prerequisites>
-
-    <!-- POM Identification -->
-
-    <artifactId>jetspeed-rdbms</artifactId>
-    <parent>
-        <groupId>org.apache.portals.jetspeed-2</groupId>
-        <artifactId>components</artifactId>
-        <version>2.1-dev</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <packaging>jar</packaging>
-    <name>Jetspeed-2 RDBMS Components</name>
-    <description>
-        RDBMS Components
-    </description>
-
-    <!-- Dependencies -->
-
-    <dependencies>
-
-        <!-- Build Dependencies -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springmodules</groupId>
-            <artifactId>spring-modules-ojb</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>jetspeed-cm</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ojb</groupId>
-            <artifactId>db-ojb</artifactId>
-        </dependency>
-        <!--
-            Note: tyrex and junit are normally required only for test, but 
-            in this case, abstract test cases are included in the component
-            build... this should probably be fixed... for now, assume that
-            tyrex and/or junit will be provided if these test classes are
-            used.
-        -->
-        <dependency>
-            <groupId>tyrex</groupId>
-            <artifactId>tyrex</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-    </dependencies>
-
-    <!-- Build Configuration -->
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>hot-deploy-component</id>
-                        <phase>install</phase>
-                        <configuration>
-                            <tasks>
-                                <ant target="hot-deploy-jar" antfile="build.xml" dir="${basedir}/../../app-servers" inheritall="off">
-                                    <property name="org.apache.jetspeed.deploy.enable"
-                                              value="${org.apache.jetspeed.env.hotdeploy}"/>
-                                    <property name="org.apache.jetspeed.deploy.target"
-                                              value="${org.apache.jetspeed.env.deploy.target}"/>
-                                    <property name="org.apache.jetspeed.server.home"
-                                              value="${org.apache.jetspeed.server.home}"/>
-                                    <property name="org.apache.jetspeed.deploy.groupid"
-                                              value="${pom.groupId}"/>
-                                    <property name="org.apache.jetspeed.deploy.artifactid"
-                                              value="${pom.artifactId}"/>
-                                    <property name="org.apache.jetspeed.deploy.version"
-                                              value="${pom.version}"/>
-                                </ant>
-                            </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <!-- Project Information -->
-
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/rdbms</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/rdbms</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/rdbms/</url>
-    </scm>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2006 The Apache Software Foundation
+
+Licensed 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:$
+-->
+<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">
+
+    <modelVersion>4.0.0</modelVersion>
+    <prerequisites>
+        <maven>2.0.4</maven>
+    </prerequisites>
+
+    <!-- POM Identification -->
+
+    <artifactId>jetspeed-rdbms</artifactId>
+    <parent>
+        <groupId>org.apache.portals.jetspeed-2</groupId>
+        <artifactId>components</artifactId>
+        <version>2.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <packaging>jar</packaging>
+    <name>Jetspeed-2 RDBMS Components</name>
+    <description>
+        RDBMS Components
+    </description>
+
+    <!-- Dependencies -->
+
+    <dependencies>
+
+        <!-- Build Dependencies -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springmodules</groupId>
+            <artifactId>spring-modules-ojb</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-cm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ojb</groupId>
+            <artifactId>db-ojb</artifactId>
+        </dependency>
+        <!--
+            Note: tyrex and junit are normally required only for test, but 
+            in this case, abstract test cases are included in the component
+            build... this should probably be fixed... for now, assume that
+            tyrex and/or junit will be provided if these test classes are
+            used.
+        -->
+        <dependency>
+            <groupId>tyrex</groupId>
+            <artifactId>tyrex</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
+    <!-- Build Configuration -->
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>hot-deploy-component</id>
+                        <phase>install</phase>
+                        <configuration>
+                            <tasks>
+                                <ant target="hot-deploy-jar" antfile="build.xml" dir="${basedir}/../../app-servers" inheritall="off">
+                                    <property name="org.apache.jetspeed.deploy.enable"
+                                              value="${org.apache.jetspeed.env.hotdeploy}"/>
+                                    <property name="org.apache.jetspeed.deploy.target"
+                                              value="${org.apache.jetspeed.env.deploy.target}"/>
+                                    <property name="org.apache.jetspeed.server.home"
+                                              value="${org.apache.jetspeed.server.home}"/>
+                                    <property name="org.apache.jetspeed.deploy.groupid"
+                                              value="${pom.groupId}"/>
+                                    <property name="org.apache.jetspeed.deploy.artifactid"
+                                              value="${pom.artifactId}"/>
+                                    <property name="org.apache.jetspeed.deploy.version"
+                                              value="${pom.version}"/>
+                                </ant>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- Project Information -->
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/rdbms</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/rdbms</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/rdbms/</url>
+    </scm>
+
+</project>

Modified: portals/jetspeed-2/trunk/components/registry/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/registry/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/registry/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/rewriter/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/rewriter/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/components/rewriter/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/rewriter/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/search/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/search/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/components/search/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/search/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/security-schema/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security-schema/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/components/security-schema/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/security-schema/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/security/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/components/security/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/security/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/serializer/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/serializer/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/sso/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/sso/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/components/sso/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/sso/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/statistics/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/statistics/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/statistics/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/web-content/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/web-content/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/components/web-content/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/web-content/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/webapp-logging/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/webapp-logging/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/components/webapp-logging/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/webapp-logging/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/enterprise/ear-full/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/enterprise/ear-full/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/enterprise/ear-full/pom.xml (original)
+++ portals/jetspeed-2/trunk/enterprise/ear-full/pom.xml Mon Feb 26 20:11:47 2007
@@ -1,146 +1,146 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright 2006 The Apache Software Foundation
-
-Licensed 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:$
--->
-<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">
-
-    <modelVersion>4.0.0</modelVersion>
-    <prerequisites>
-        <maven>2.0.4</maven>
-    </prerequisites>
-
-    <!-- POM Identification -->
-
-    <artifactId>jetspeed-full</artifactId>
-    <parent>
-        <groupId>org.apache.portals.jetspeed-2</groupId>
-        <artifactId>jetspeed-enterprise</artifactId>
-        <version>2.1-dev</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>    
-    <packaging>ear</packaging>
-    <name>Jetspeed-2 Full Enterprise Archive</name>
-
-    <!-- Application Modules -->
-
-    <modules>
-    </modules>
-
-    <!-- Application Dependencies -->
-    
-    <dependencies>
-        <!-- Provided Dependencies -->
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>j2-admin</artifactId>
- 		    <type>war</type>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>demo</artifactId>
- 		    <type>war</type>
-        </dependency>        
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>rss</artifactId>
- 		    <type>war</type>
-        </dependency>        
-        <dependency>
-            <groupId>org.apache.portals.bridges</groupId>
-            <artifactId>jpetstore</artifactId>
-            <version>1.0</version>            
- 		    <type>war</type>
-        </dependency>        
-        <dependency>
-            <groupId>org.apache.portals.bridges</groupId>
-            <artifactId>jsf-demo</artifactId>
-            <version>1.0</version>            
- 		    <type>war</type>
-        </dependency>        
-    </dependencies>
-
-	 <build>
-		<plugins>
-		      <plugin>
-		        <groupId>org.apache.maven.plugins</groupId>
-		        <artifactId>maven-ear-plugin</artifactId>
-		        <configuration>
-		           <modules>
-		             <webModule>
-		               <groupId>${pom.groupId}</groupId>
-		               <artifactId>jetspeed</artifactId>
-		               <contextRoot>/jetspeed</contextRoot>
-		             </webModule>                                              
-		             <webModule>
-		               <groupId>${pom.groupId}</groupId>
-		               <artifactId>j2-admin</artifactId>
-		               <contextRoot>/j2-admin</contextRoot>
-		             </webModule>
-		             <webModule>
-		               <groupId>${pom.groupId}</groupId>
-		               <artifactId>demo</artifactId>
-		               <contextRoot>/demo</contextRoot>
-		             </webModule>                       
-		             <webModule>
-		               <groupId>${pom.groupId}</groupId>
-		               <artifactId>rss</artifactId>
-		               <contextRoot>/rss</contextRoot>
-		             </webModule>                       
-		             <webModule>
-		               <groupId>org.apache.portals.bridges</groupId>
-		               <artifactId>jpetstore</artifactId>
-		               <contextRoot>/jpetstore</contextRoot>
-		             </webModule>                       
-		             <webModule>
-		               <groupId>org.apache.portals.bridges</groupId>
-		               <artifactId>jsf-demo</artifactId>
-		               <contextRoot>/jsf-demo</contextRoot>
-		             </webModule>                       
-  				   <javaModule>
-                      <groupId>${pom.groupId}</groupId>
-                      <artifactId>jetspeed-api</artifactId>
-                      <bundleDir>/</bundleDir>
-                   </javaModule>
- 				   <javaModule>
-                      <groupId>${pom.groupId}</groupId>
-                      <artifactId>jetspeed-commons</artifactId>
-                      <bundleDir>/</bundleDir>
-                   </javaModule>
- 				   <javaModule>
-                      <groupId>org.apache.portals.bridges</groupId>
-                      <artifactId>portals-bridges-common</artifactId>
-                      <bundleDir>/</bundleDir>
-                   </javaModule>
- 				   <javaModule>                      
-                      <groupId>portlet-api</groupId>
-                      <artifactId>portlet-api</artifactId>
-                      <bundleDir>/</bundleDir>
-                   </javaModule>
- 				   <javaModule>                      
-                      <groupId>org.apache.pluto</groupId>
-                      <artifactId>pluto</artifactId>                        
-                      <bundleDir>/</bundleDir>
-                   </javaModule>                                              
-		          </modules>
-		        </configuration>
-		      </plugin>
-		    </plugins>
-	 </build>
-</project>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2006 The Apache Software Foundation
+
+Licensed 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:$
+-->
+<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">
+
+    <modelVersion>4.0.0</modelVersion>
+    <prerequisites>
+        <maven>2.0.4</maven>
+    </prerequisites>
+
+    <!-- POM Identification -->
+
+    <artifactId>jetspeed-full</artifactId>
+    <parent>
+        <groupId>org.apache.portals.jetspeed-2</groupId>
+        <artifactId>jetspeed-enterprise</artifactId>
+        <version>2.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>    
+    <packaging>ear</packaging>
+    <name>Jetspeed-2 Full Enterprise Archive</name>
+
+    <!-- Application Modules -->
+
+    <modules>
+    </modules>
+
+    <!-- Application Dependencies -->
+    
+    <dependencies>
+        <!-- Provided Dependencies -->
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>j2-admin</artifactId>
+ 		    <type>war</type>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>demo</artifactId>
+ 		    <type>war</type>
+        </dependency>        
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>rss</artifactId>
+ 		    <type>war</type>
+        </dependency>        
+        <dependency>
+            <groupId>org.apache.portals.bridges</groupId>
+            <artifactId>jpetstore</artifactId>
+            <version>1.0</version>            
+ 		    <type>war</type>
+        </dependency>        
+        <dependency>
+            <groupId>org.apache.portals.bridges</groupId>
+            <artifactId>jsf-demo</artifactId>
+            <version>1.0</version>            
+ 		    <type>war</type>
+        </dependency>        
+    </dependencies>
+
+	 <build>
+		<plugins>
+		      <plugin>
+		        <groupId>org.apache.maven.plugins</groupId>
+		        <artifactId>maven-ear-plugin</artifactId>
+		        <configuration>
+		           <modules>
+		             <webModule>
+		               <groupId>${pom.groupId}</groupId>
+		               <artifactId>jetspeed</artifactId>
+		               <contextRoot>/jetspeed</contextRoot>
+		             </webModule>                                              
+		             <webModule>
+		               <groupId>${pom.groupId}</groupId>
+		               <artifactId>j2-admin</artifactId>
+		               <contextRoot>/j2-admin</contextRoot>
+		             </webModule>
+		             <webModule>
+		               <groupId>${pom.groupId}</groupId>
+		               <artifactId>demo</artifactId>
+		               <contextRoot>/demo</contextRoot>
+		             </webModule>                       
+		             <webModule>
+		               <groupId>${pom.groupId}</groupId>
+		               <artifactId>rss</artifactId>
+		               <contextRoot>/rss</contextRoot>
+		             </webModule>                       
+		             <webModule>
+		               <groupId>org.apache.portals.bridges</groupId>
+		               <artifactId>jpetstore</artifactId>
+		               <contextRoot>/jpetstore</contextRoot>
+		             </webModule>                       
+		             <webModule>
+		               <groupId>org.apache.portals.bridges</groupId>
+		               <artifactId>jsf-demo</artifactId>
+		               <contextRoot>/jsf-demo</contextRoot>
+		             </webModule>                       
+  				   <javaModule>
+                      <groupId>${pom.groupId}</groupId>
+                      <artifactId>jetspeed-api</artifactId>
+                      <bundleDir>/</bundleDir>
+                   </javaModule>
+ 				   <javaModule>
+                      <groupId>${pom.groupId}</groupId>
+                      <artifactId>jetspeed-commons</artifactId>
+                      <bundleDir>/</bundleDir>
+                   </javaModule>
+ 				   <javaModule>
+                      <groupId>org.apache.portals.bridges</groupId>
+                      <artifactId>portals-bridges-common</artifactId>
+                      <bundleDir>/</bundleDir>
+                   </javaModule>
+ 				   <javaModule>                      
+                      <groupId>portlet-api</groupId>
+                      <artifactId>portlet-api</artifactId>
+                      <bundleDir>/</bundleDir>
+                   </javaModule>
+ 				   <javaModule>                      
+                      <groupId>org.apache.pluto</groupId>
+                      <artifactId>pluto</artifactId>                        
+                      <bundleDir>/</bundleDir>
+                   </javaModule>                                              
+		          </modules>
+		        </configuration>
+		      </plugin>
+		    </plugins>
+	 </build>
+</project>
+

Modified: portals/jetspeed-2/trunk/enterprise/ear-min/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/enterprise/ear-min/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/enterprise/ear-min/pom.xml (original)
+++ portals/jetspeed-2/trunk/enterprise/ear-min/pom.xml Mon Feb 26 20:11:47 2007
@@ -1,105 +1,105 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright 2006 The Apache Software Foundation
-
-Licensed 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:$
--->
-<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">
-
-    <modelVersion>4.0.0</modelVersion>
-    <prerequisites>
-        <maven>2.0.4</maven>
-    </prerequisites>
-
-    <!-- POM Identification -->
-
-    <artifactId>jetspeed-min</artifactId>
-    <parent>
-        <groupId>org.apache.portals.jetspeed-2</groupId>
-        <artifactId>jetspeed-enterprise</artifactId>
-        <version>2.1-dev</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>    
-    <packaging>ear</packaging>
-    <name>Jetspeed-2 Minimal Enterprise Archive</name>
-
-    <!-- Application Modules -->
-
-    <modules>
-    </modules>
-
-    <!-- Application Dependencies -->
-    
-    <dependencies>
-        <!-- Provided Dependencies -->
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>j2-admin</artifactId>
- 		    <type>war</type>
-        </dependency>
-    </dependencies>
-
-	 <build>
-		<plugins>
-		      <plugin>
-		        <groupId>org.apache.maven.plugins</groupId>
-		        <artifactId>maven-ear-plugin</artifactId>
-		        <configuration>
-		           <modules>
-		             <webModule>
-		               <groupId>${pom.groupId}</groupId>
-		               <artifactId>jetspeed</artifactId>
-		               <contextRoot>/jetspeed</contextRoot>
-		             </webModule>                       
-		             <webModule>
-		               <groupId>${pom.groupId}</groupId>
-		               <artifactId>j2-admin</artifactId>
-		               <contextRoot>/j2-admin</contextRoot>
-		             </webModule>
-                       
-  				   <javaModule>
-                      <groupId>${pom.groupId}</groupId>
-                      <artifactId>jetspeed-api</artifactId>
-                      <bundleDir>/</bundleDir>
-                   </javaModule>
- 				   <javaModule>
-                      <groupId>${pom.groupId}</groupId>
-                      <artifactId>jetspeed-commons</artifactId>
-                      <bundleDir>/</bundleDir>
-                   </javaModule>
- 				   <javaModule>
-                      <groupId>org.apache.portals.bridges</groupId>
-                      <artifactId>portals-bridges-common</artifactId>
-                      <bundleDir>/</bundleDir>
-                   </javaModule>
- 				   <javaModule>                      
-                      <groupId>portlet-api</groupId>
-                      <artifactId>portlet-api</artifactId>
-                      <bundleDir>/</bundleDir>
-                   </javaModule>
- 				   <javaModule>                      
-                      <groupId>org.apache.pluto</groupId>
-                      <artifactId>pluto</artifactId>                        
-                      <bundleDir>/</bundleDir>
-                   </javaModule>                                              
-		          </modules>
-		        </configuration>
-		      </plugin>
-		    </plugins>
-	 </build>
-</project>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2006 The Apache Software Foundation
+
+Licensed 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:$
+-->
+<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">
+
+    <modelVersion>4.0.0</modelVersion>
+    <prerequisites>
+        <maven>2.0.4</maven>
+    </prerequisites>
+
+    <!-- POM Identification -->
+
+    <artifactId>jetspeed-min</artifactId>
+    <parent>
+        <groupId>org.apache.portals.jetspeed-2</groupId>
+        <artifactId>jetspeed-enterprise</artifactId>
+        <version>2.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>    
+    <packaging>ear</packaging>
+    <name>Jetspeed-2 Minimal Enterprise Archive</name>
+
+    <!-- Application Modules -->
+
+    <modules>
+    </modules>
+
+    <!-- Application Dependencies -->
+    
+    <dependencies>
+        <!-- Provided Dependencies -->
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>j2-admin</artifactId>
+ 		    <type>war</type>
+        </dependency>
+    </dependencies>
+
+	 <build>
+		<plugins>
+		      <plugin>
+		        <groupId>org.apache.maven.plugins</groupId>
+		        <artifactId>maven-ear-plugin</artifactId>
+		        <configuration>
+		           <modules>
+		             <webModule>
+		               <groupId>${pom.groupId}</groupId>
+		               <artifactId>jetspeed</artifactId>
+		               <contextRoot>/jetspeed</contextRoot>
+		             </webModule>                       
+		             <webModule>
+		               <groupId>${pom.groupId}</groupId>
+		               <artifactId>j2-admin</artifactId>
+		               <contextRoot>/j2-admin</contextRoot>
+		             </webModule>
+                       
+  				   <javaModule>
+                      <groupId>${pom.groupId}</groupId>
+                      <artifactId>jetspeed-api</artifactId>
+                      <bundleDir>/</bundleDir>
+                   </javaModule>
+ 				   <javaModule>
+                      <groupId>${pom.groupId}</groupId>
+                      <artifactId>jetspeed-commons</artifactId>
+                      <bundleDir>/</bundleDir>
+                   </javaModule>
+ 				   <javaModule>
+                      <groupId>org.apache.portals.bridges</groupId>
+                      <artifactId>portals-bridges-common</artifactId>
+                      <bundleDir>/</bundleDir>
+                   </javaModule>
+ 				   <javaModule>                      
+                      <groupId>portlet-api</groupId>
+                      <artifactId>portlet-api</artifactId>
+                      <bundleDir>/</bundleDir>
+                   </javaModule>
+ 				   <javaModule>                      
+                      <groupId>org.apache.pluto</groupId>
+                      <artifactId>pluto</artifactId>                        
+                      <bundleDir>/</bundleDir>
+                   </javaModule>                                              
+		          </modules>
+		        </configuration>
+		      </plugin>
+		    </plugins>
+	 </build>
+</project>
+

Modified: portals/jetspeed-2/trunk/enterprise/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/enterprise/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/enterprise/pom.xml (original)
+++ portals/jetspeed-2/trunk/enterprise/pom.xml Mon Feb 26 20:11:47 2007
@@ -1,88 +1,88 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright 2006 The Apache Software Foundation
-
-Licensed 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:$
--->
-<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">
-
-    <modelVersion>4.0.0</modelVersion>
-    <prerequisites>
-        <maven>2.0.4</maven>
-    </prerequisites>
-
-    <!-- POM Identification -->
-
-    <artifactId>jetspeed-enterprise</artifactId>
-    <parent>
-        <groupId>org.apache.portals.jetspeed-2</groupId>
-        <artifactId>jetspeed-2</artifactId>
-        <version>2.1-dev</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <packaging>pom</packaging>
-    <name>Jetspeed-2 Enterprise Deployments</name>
-    <description>
-        Jetspeed-2 Enterprise Deployment Builds
-    </description>
-
-    <!-- Application Modules -->
-
-    <modules>
-        <module>ear-full</module>
-        <module>ear-min</module>    
-    </modules>
-
-    <!-- Application Dependencies -->
-
-    <dependencies>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>jetspeed</artifactId>
- 		    <type>war</type>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>jetspeed-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>jetspeed-commons</artifactId>
-        </dependency>
-        <dependency>       
-            <groupId>portlet-api</groupId>
-            <artifactId>portlet-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.pluto</groupId>
-            <artifactId>pluto</artifactId>
-        </dependency>        
-        <dependency>
-            <groupId>org.apache.portals.bridges</groupId>
-            <artifactId>portals-bridges-common</artifactId>
-        </dependency>
-    </dependencies>
-
-    <!-- Project Information -->
-
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/enterprise</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/enterprise</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/enterprise/</url>
-    </scm>
-    
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2006 The Apache Software Foundation
+
+Licensed 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:$
+-->
+<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">
+
+    <modelVersion>4.0.0</modelVersion>
+    <prerequisites>
+        <maven>2.0.4</maven>
+    </prerequisites>
+
+    <!-- POM Identification -->
+
+    <artifactId>jetspeed-enterprise</artifactId>
+    <parent>
+        <groupId>org.apache.portals.jetspeed-2</groupId>
+        <artifactId>jetspeed-2</artifactId>
+        <version>2.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <packaging>pom</packaging>
+    <name>Jetspeed-2 Enterprise Deployments</name>
+    <description>
+        Jetspeed-2 Enterprise Deployment Builds
+    </description>
+
+    <!-- Application Modules -->
+
+    <modules>
+        <module>ear-full</module>
+        <module>ear-min</module>    
+    </modules>
+
+    <!-- Application Dependencies -->
+
+    <dependencies>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed</artifactId>
+ 		    <type>war</type>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-commons</artifactId>
+        </dependency>
+        <dependency>       
+            <groupId>portlet-api</groupId>
+            <artifactId>portlet-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.pluto</groupId>
+            <artifactId>pluto</artifactId>
+        </dependency>        
+        <dependency>
+            <groupId>org.apache.portals.bridges</groupId>
+            <artifactId>portals-bridges-common</artifactId>
+        </dependency>
+    </dependencies>
+
+    <!-- Project Information -->
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/enterprise</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/enterprise</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/enterprise/</url>
+    </scm>
+    
+</project>

Modified: portals/jetspeed-2/trunk/etc/import/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/etc/import/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/etc/import/pom.xml (original)
+++ portals/jetspeed-2/trunk/etc/import/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>jetspeed-2</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

Modified: portals/jetspeed-2/trunk/etc/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/etc/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/etc/pom.xml (original)
+++ portals/jetspeed-2/trunk/etc/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>jetspeed-2</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

Modified: portals/jetspeed-2/trunk/jetspeed-api/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-api/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/pom.xml (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>jetspeed-2</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/layout-portlets/layout-portlets-jar/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/layout-portlets/layout-portlets-jar/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/layout-portlets/layout-portlets-jar/pom.xml (original)
+++ portals/jetspeed-2/trunk/layout-portlets/layout-portlets-jar/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>layout-portlets</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/layout-portlets/layout-portlets-war/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/layout-portlets/layout-portlets-war/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/layout-portlets/layout-portlets-war/pom.xml (original)
+++ portals/jetspeed-2/trunk/layout-portlets/layout-portlets-war/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>layout-portlets</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>war</packaging>

Modified: portals/jetspeed-2/trunk/layout-portlets/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/layout-portlets/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/layout-portlets/pom.xml (original)
+++ portals/jetspeed-2/trunk/layout-portlets/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>jetspeed-2</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

Modified: portals/jetspeed-2/trunk/layout-portlets/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/layout-portlets/project.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/layout-portlets/project.xml (original)
+++ portals/jetspeed-2/trunk/layout-portlets/project.xml Mon Feb 26 20:11:47 2007
@@ -158,4 +158,23 @@
 	        </properties>
 		</dependency>
     </dependencies>
+
+    <build>
+        <sourceDirectory>src/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>${basedir}/src/java</directory>
+                <excludes>
+                    <exclude>**/*.java</exclude>
+                </excludes>
+            </resource>
+            <resource>
+                <directory>${basedir}/../</directory>
+                <targetPath>../${pom.artifactId}/META-INF</targetPath>
+                <includes>
+                    <include>LICENSE.TXT</include>
+                </includes>
+            </resource>
+        </resources>
+    </build>
 </project>

Modified: portals/jetspeed-2/trunk/maven-archetypes/application/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/application/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/application/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/application/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>maven-archetypes</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/maven-archetypes/component/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/component/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/component/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/component/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>maven-archetypes</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/maven-archetypes/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>jetspeed-2</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

Modified: portals/jetspeed-2/trunk/maven-archetypes/portal-component/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal-component/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal-component/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal-component/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>maven-archetypes</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/maven-archetypes/portal-resources/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal-resources/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal-resources/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal-resources/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>maven-archetypes</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/pom.xml?view=diff&rev=512129&r1=512128&r2=512129
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/pom.xml Mon Feb 26 20:11:47 2007
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>maven-archetypes</artifactId>
-        <version>2.1-dev</version>
+        <version>2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message