You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by da...@apache.org on 2008/04/11 15:54:18 UTC

svn commit: r647167 - in /wicket/trunk: ./ archetypes/quickstart/ jdk-1.4/ jdk-1.4/wicket-datetime/ jdk-1.4/wicket-extensions/ jdk-1.4/wicket-ioc/ jdk-1.4/wicket-quickstart/ jdk-1.4/wicket-spring/ jdk-1.4/wicket-velocity/ jdk-1.4/wicket/ jdk-1.5/ jdk-1...

Author: dashorst
Date: Fri Apr 11 06:53:58 2008
New Revision: 647167

URL: http://svn.apache.org/viewvc?rev=647167&view=rev
Log:
WICKET-1516

Added:
    wicket/trunk/wicket/
      - copied from r647118, wicket/trunk/jdk-1.4/wicket/
    wicket/trunk/wicket-auth-roles/
      - copied from r647118, wicket/trunk/jdk-1.5/wicket-auth-roles/
    wicket/trunk/wicket-auth-roles/.settings/
      - copied from r647166, wicket/trunk/jdk-1.5/wicket-auth-roles/.settings/
    wicket/trunk/wicket-auth-roles/pom.xml
      - copied, changed from r647166, wicket/trunk/jdk-1.5/wicket-auth-roles/pom.xml
    wicket/trunk/wicket-auth-roles/src/
      - copied from r647166, wicket/trunk/jdk-1.5/wicket-auth-roles/src/
    wicket/trunk/wicket-datetime/
      - copied from r647118, wicket/trunk/jdk-1.4/wicket-datetime/
    wicket/trunk/wicket-datetime/.settings/
      - copied from r647166, wicket/trunk/jdk-1.4/wicket-datetime/.settings/
    wicket/trunk/wicket-datetime/pom.xml
      - copied, changed from r647166, wicket/trunk/jdk-1.4/wicket-datetime/pom.xml
    wicket/trunk/wicket-datetime/src/
      - copied from r647166, wicket/trunk/jdk-1.4/wicket-datetime/src/
    wicket/trunk/wicket-examples/
      - copied from r647118, wicket/trunk/jdk-1.5/wicket-examples/
    wicket/trunk/wicket-examples/.amateras
      - copied unchanged from r647166, wicket/trunk/jdk-1.5/wicket-examples/.amateras
    wicket/trunk/wicket-examples/.settings/
      - copied from r647166, wicket/trunk/jdk-1.5/wicket-examples/.settings/
    wicket/trunk/wicket-examples/.tomcatplugin
      - copied unchanged from r647166, wicket/trunk/jdk-1.5/wicket-examples/.tomcatplugin
    wicket/trunk/wicket-examples/jetty-examples.launch
      - copied unchanged from r647166, wicket/trunk/jdk-1.5/wicket-examples/jetty-examples.launch
    wicket/trunk/wicket-examples/pom.xml
      - copied, changed from r647166, wicket/trunk/jdk-1.5/wicket-examples/pom.xml
    wicket/trunk/wicket-examples/src/
      - copied from r647166, wicket/trunk/jdk-1.5/wicket-examples/src/
    wicket/trunk/wicket-extensions/
      - copied from r647118, wicket/trunk/jdk-1.4/wicket-extensions/
    wicket/trunk/wicket-extensions/.amateras
      - copied unchanged from r647166, wicket/trunk/jdk-1.4/wicket-extensions/.amateras
    wicket/trunk/wicket-extensions/.settings/
      - copied from r647166, wicket/trunk/jdk-1.4/wicket-extensions/.settings/
    wicket/trunk/wicket-extensions/pom.xml
      - copied, changed from r647166, wicket/trunk/jdk-1.4/wicket-extensions/pom.xml
    wicket/trunk/wicket-extensions/src/
      - copied from r647166, wicket/trunk/jdk-1.4/wicket-extensions/src/
    wicket/trunk/wicket-guice/
      - copied from r647118, wicket/trunk/jdk-1.5/wicket-guice/
    wicket/trunk/wicket-guice/.settings/
      - copied from r647166, wicket/trunk/jdk-1.5/wicket-guice/.settings/
    wicket/trunk/wicket-guice/pom.xml
      - copied, changed from r647166, wicket/trunk/jdk-1.5/wicket-guice/pom.xml
    wicket/trunk/wicket-guice/src/
      - copied from r647166, wicket/trunk/jdk-1.5/wicket-guice/src/
    wicket/trunk/wicket-ioc/
      - copied from r647118, wicket/trunk/jdk-1.4/wicket-ioc/
    wicket/trunk/wicket-ioc/.settings/
      - copied from r647166, wicket/trunk/jdk-1.4/wicket-ioc/.settings/
    wicket/trunk/wicket-ioc/pom.xml
      - copied, changed from r647166, wicket/trunk/jdk-1.4/wicket-ioc/pom.xml
    wicket/trunk/wicket-ioc/src/
      - copied from r647166, wicket/trunk/jdk-1.4/wicket-ioc/src/
    wicket/trunk/wicket-jmx/
      - copied from r647118, wicket/trunk/jdk-1.5/wicket-jmx/
    wicket/trunk/wicket-jmx/.settings/
      - copied from r647166, wicket/trunk/jdk-1.5/wicket-jmx/.settings/
    wicket/trunk/wicket-jmx/pom.xml
      - copied, changed from r647166, wicket/trunk/jdk-1.5/wicket-jmx/pom.xml
    wicket/trunk/wicket-jmx/src/
      - copied from r647166, wicket/trunk/jdk-1.5/wicket-jmx/src/
    wicket/trunk/wicket-objectssizeof-agent/
      - copied from r647118, wicket/trunk/jdk-1.5/wicket-objectssizeof-agent/
    wicket/trunk/wicket-objectssizeof-agent/.settings/
      - copied from r647166, wicket/trunk/jdk-1.5/wicket-objectssizeof-agent/.settings/
    wicket/trunk/wicket-objectssizeof-agent/pom.xml
      - copied, changed from r647166, wicket/trunk/jdk-1.5/wicket-objectssizeof-agent/pom.xml
    wicket/trunk/wicket-objectssizeof-agent/src/
      - copied from r647166, wicket/trunk/jdk-1.5/wicket-objectssizeof-agent/src/
    wicket/trunk/wicket-quickstart/
      - copied from r647118, wicket/trunk/jdk-1.4/wicket-quickstart/
    wicket/trunk/wicket-quickstart/.settings/
      - copied from r647166, wicket/trunk/jdk-1.4/wicket-quickstart/.settings/
    wicket/trunk/wicket-quickstart/.tomcatplugin
      - copied unchanged from r647166, wicket/trunk/jdk-1.4/wicket-quickstart/.tomcatplugin
    wicket/trunk/wicket-quickstart/NOTICE
      - copied unchanged from r647166, wicket/trunk/jdk-1.4/wicket-quickstart/NOTICE
    wicket/trunk/wicket-quickstart/jetty-quickstart.launch
      - copied unchanged from r647166, wicket/trunk/jdk-1.4/wicket-quickstart/jetty-quickstart.launch
    wicket/trunk/wicket-quickstart/pom.xml
      - copied, changed from r647166, wicket/trunk/jdk-1.4/wicket-quickstart/pom.xml
    wicket/trunk/wicket-quickstart/src/
      - copied from r647166, wicket/trunk/jdk-1.4/wicket-quickstart/src/
    wicket/trunk/wicket-spring/
      - copied from r647118, wicket/trunk/jdk-1.4/wicket-spring/
    wicket/trunk/wicket-spring-annot/
      - copied from r647118, wicket/trunk/jdk-1.5/wicket-spring-annot/
    wicket/trunk/wicket-spring-annot/.settings/
      - copied from r647166, wicket/trunk/jdk-1.5/wicket-spring-annot/.settings/
    wicket/trunk/wicket-spring-annot/pom.xml
      - copied, changed from r647166, wicket/trunk/jdk-1.5/wicket-spring-annot/pom.xml
    wicket/trunk/wicket-spring-annot/src/
      - copied from r647166, wicket/trunk/jdk-1.5/wicket-spring-annot/src/
    wicket/trunk/wicket-spring/.settings/
      - copied from r647166, wicket/trunk/jdk-1.4/wicket-spring/.settings/
    wicket/trunk/wicket-spring/pom.xml
      - copied, changed from r647166, wicket/trunk/jdk-1.4/wicket-spring/pom.xml
    wicket/trunk/wicket-spring/src/
      - copied from r647166, wicket/trunk/jdk-1.4/wicket-spring/src/
    wicket/trunk/wicket-velocity/
      - copied from r647118, wicket/trunk/jdk-1.4/wicket-velocity/
    wicket/trunk/wicket-velocity/.settings/
      - copied from r647166, wicket/trunk/jdk-1.4/wicket-velocity/.settings/
    wicket/trunk/wicket-velocity/pom.xml
      - copied, changed from r647166, wicket/trunk/jdk-1.4/wicket-velocity/pom.xml
    wicket/trunk/wicket-velocity/src/
      - copied from r647166, wicket/trunk/jdk-1.4/wicket-velocity/src/
    wicket/trunk/wicket/.settings/
      - copied from r647166, wicket/trunk/jdk-1.4/wicket/.settings/
    wicket/trunk/wicket/EclipseCodeFormat.xml
      - copied unchanged from r647166, wicket/trunk/jdk-1.4/wicket/EclipseCodeFormat.xml
    wicket/trunk/wicket/pom.xml
      - copied, changed from r647166, wicket/trunk/jdk-1.4/wicket/pom.xml
    wicket/trunk/wicket/src/
      - copied from r647166, wicket/trunk/jdk-1.4/wicket/src/
    wicket/trunk/wicket/wicket-xhtml1-strict.dtd
      - copied unchanged from r647166, wicket/trunk/jdk-1.4/wicket/wicket-xhtml1-strict.dtd
Removed:
    wicket/trunk/jdk-1.4/wicket/
    wicket/trunk/jdk-1.4/wicket-datetime/
    wicket/trunk/jdk-1.4/wicket-extensions/
    wicket/trunk/jdk-1.4/wicket-ioc/
    wicket/trunk/jdk-1.4/wicket-quickstart/
    wicket/trunk/jdk-1.4/wicket-spring/
    wicket/trunk/jdk-1.4/wicket-velocity/
    wicket/trunk/jdk-1.5/wicket-auth-roles/
    wicket/trunk/jdk-1.5/wicket-examples/
    wicket/trunk/jdk-1.5/wicket-guice/
    wicket/trunk/jdk-1.5/wicket-jmx/
    wicket/trunk/jdk-1.5/wicket-objectssizeof-agent/
    wicket/trunk/jdk-1.5/wicket-spring-annot/
Modified:
    wicket/trunk/archetypes/quickstart/pom.xml
    wicket/trunk/jdk-1.4/pom.xml
    wicket/trunk/jdk-1.5/pom.xml
    wicket/trunk/pom.xml
    wicket/trunk/testing/wicket-threadtest/pom.xml

Modified: wicket/trunk/archetypes/quickstart/pom.xml
URL: http://svn.apache.org/viewvc/wicket/trunk/archetypes/quickstart/pom.xml?rev=647167&r1=647166&r2=647167&view=diff
==============================================================================
--- wicket/trunk/archetypes/quickstart/pom.xml (original)
+++ wicket/trunk/archetypes/quickstart/pom.xml Fri Apr 11 06:53:58 2008
@@ -2,9 +2,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
 		<groupId>org.apache.wicket</groupId>
-		<artifactId>wicket-jdk14</artifactId>
+		<artifactId>wicket-parent</artifactId>
 		<version>1.4-SNAPSHOT</version>
-		<relativePath>../../jdk14/pom.xml</relativePath>
+		<relativePath>../../pom.xml</relativePath>
   </parent>
   
   <artifactId>wicket-archetype-quickstart</artifactId>
@@ -23,4 +23,4 @@
 		</resources>
 	</build>
 	
-</project>
\ No newline at end of file
+</project>

Modified: wicket/trunk/jdk-1.4/pom.xml
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/pom.xml?rev=647167&r1=647166&r2=647167&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/pom.xml (original)
+++ wicket/trunk/jdk-1.4/pom.xml Fri Apr 11 06:53:58 2008
@@ -28,7 +28,7 @@
 	</parent>
 
 	<groupId>org.apache.wicket</groupId>
-	<artifactId>wicket-jdk14</artifactId>
+	<artifactId>wicket-parent</artifactId>
 	<packaging>pom</packaging>
 
 	<name>Wicket JDK 1.4 modules</name>

Modified: wicket/trunk/jdk-1.5/pom.xml
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/pom.xml?rev=647167&r1=647166&r2=647167&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/pom.xml (original)
+++ wicket/trunk/jdk-1.5/pom.xml Fri Apr 11 06:53:58 2008
@@ -22,7 +22,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>org.apache.wicket</groupId>
-	<artifactId>wicket-jdk15</artifactId>
+	<artifactId>wicket-parent</artifactId>
 	<packaging>pom</packaging>
 	<parent>
 		<groupId>org.apache.wicket</groupId>

Modified: wicket/trunk/pom.xml
URL: http://svn.apache.org/viewvc/wicket/trunk/pom.xml?rev=647167&r1=647166&r2=647167&view=diff
==============================================================================
--- wicket/trunk/pom.xml (original)
+++ wicket/trunk/pom.xml Fri Apr 11 06:53:58 2008
@@ -31,27 +31,6 @@
 
 	<profiles>
 		<profile>
-			<id>jdk-1.4</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-				<jdk>1.4</jdk>
-			</activation>
-			<modules>
-				<module>jdk-1.4</module>
-				<module>archetypes/quickstart</module>
-			</modules>
-		</profile>
-		<profile>
-			<id>jdk-1.5</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-			<modules>
-				<module>jdk-1.5</module>
-				<module>archetypes/quickstart</module>
-			</modules>
-		</profile>
-		<profile>
 			<id>bamboo</id>
 			<activation>
 				<activeByDefault>false</activeByDefault>
@@ -71,26 +50,24 @@
 				<activeByDefault>false</activeByDefault>
 			</activation>
 			<!-- 
-				modules jdk-1.4 and jdk-1.5 are defined not to process their
+				modules parent and parent are defined not to process their
 				submodules: their release profile is empty. This way we can
 				define which projects to release with a Wicket release from
 				the parent. 
 			-->
 			<modules>
-				<module>jdk-1.4</module>
-				<module>jdk-1.4/wicket</module>
-				<module>jdk-1.4/wicket-datetime</module>
-				<module>jdk-1.4/wicket-extensions</module>
-				<module>jdk-1.4/wicket-ioc</module>
-				<module>jdk-1.4/wicket-spring</module>
-				<module>jdk-1.4/wicket-velocity</module>
-				<module>jdk-1.5</module>
-				<module>jdk-1.5/wicket-spring-annot</module>
-				<module>jdk-1.5/wicket-auth-roles</module>
-				<module>jdk-1.5/wicket-guice</module>
-				<module>jdk-1.5/wicket-jmx</module>
-				<module>jdk-1.5/wicket-objectssizeof-agent</module>
-				<module>jdk-1.5/wicket-examples</module>
+				<module>wicket</module>
+				<module>wicket-datetime</module>
+				<module>wicket-extensions</module>
+				<module>wicket-ioc</module>
+				<module>wicket-spring</module>
+				<module>wicket-velocity</module>
+				<module>wicket-spring-annot</module>
+				<module>wicket-auth-roles</module>
+				<module>wicket-guice</module>
+				<module>wicket-jmx</module>
+				<module>wicket-objectssizeof-agent</module>
+				<module>wicket-examples</module>
 				<module>archetypes/quickstart</module>
 			</modules>
 			<build>
@@ -143,8 +120,18 @@
 				<activeByDefault>true</activeByDefault>
 			</activation>
 			<modules>
-				<module>jdk-1.4</module>
-				<module>jdk-1.5</module>
+				<module>wicket</module>
+				<module>wicket-datetime</module>
+				<module>wicket-extensions</module>
+				<module>wicket-ioc</module>
+				<module>wicket-spring</module>
+				<module>wicket-velocity</module>
+				<module>wicket-spring-annot</module>
+				<module>wicket-auth-roles</module>
+				<module>wicket-guice</module>
+				<module>wicket-jmx</module>
+				<module>wicket-objectssizeof-agent</module>
+				<module>wicket-examples</module>
 				<module>archetypes/quickstart</module>
 				<module>testing/wicket-threadtest</module>
 			</modules>
@@ -554,6 +541,17 @@
 							<descriptor>wicket-assembly-all.xml</descriptor>
 						</descriptors>
 						<finalName>apache-wicket-${project.version}</finalName>
+					</configuration>
+				</plugin>
+				<plugin>
+					<inherited>true</inherited>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<configuration>
+						<source>1.5</source>
+						<target>1.5</target>
+						<optimise>true</optimise>
+						<debug>true</debug>
 					</configuration>
 				</plugin>
 				<plugin>

Modified: wicket/trunk/testing/wicket-threadtest/pom.xml
URL: http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/pom.xml?rev=647167&r1=647166&r2=647167&view=diff
==============================================================================
--- wicket/trunk/testing/wicket-threadtest/pom.xml (original)
+++ wicket/trunk/testing/wicket-threadtest/pom.xml Fri Apr 11 06:53:58 2008
@@ -22,7 +22,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.wicket</groupId>
-		<artifactId>wicket-jdk15</artifactId>
+		<artifactId>wicket-parent</artifactId>
 		<version>1.4-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>

Copied: wicket/trunk/wicket-auth-roles/pom.xml (from r647166, wicket/trunk/jdk-1.5/wicket-auth-roles/pom.xml)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-auth-roles/pom.xml?p2=wicket/trunk/wicket-auth-roles/pom.xml&p1=wicket/trunk/jdk-1.5/wicket-auth-roles/pom.xml&r1=647166&r2=647167&rev=647167&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-auth-roles/pom.xml (original)
+++ wicket/trunk/wicket-auth-roles/pom.xml Fri Apr 11 06:53:58 2008
@@ -22,7 +22,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.wicket</groupId>
-		<artifactId>wicket-jdk15</artifactId>
+		<artifactId>wicket-parent</artifactId>
 		<version>1.4-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

Copied: wicket/trunk/wicket-datetime/pom.xml (from r647166, wicket/trunk/jdk-1.4/wicket-datetime/pom.xml)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/pom.xml?p2=wicket/trunk/wicket-datetime/pom.xml&p1=wicket/trunk/jdk-1.4/wicket-datetime/pom.xml&r1=647166&r2=647167&rev=647167&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-datetime/pom.xml (original)
+++ wicket/trunk/wicket-datetime/pom.xml Fri Apr 11 06:53:58 2008
@@ -22,7 +22,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.wicket</groupId>
-		<artifactId>wicket-jdk14</artifactId>
+		<artifactId>wicket-parent</artifactId>
 		<version>1.4-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

Copied: wicket/trunk/wicket-examples/pom.xml (from r647166, wicket/trunk/jdk-1.5/wicket-examples/pom.xml)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/pom.xml?p2=wicket/trunk/wicket-examples/pom.xml&p1=wicket/trunk/jdk-1.5/wicket-examples/pom.xml&r1=647166&r2=647167&rev=647167&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/pom.xml (original)
+++ wicket/trunk/wicket-examples/pom.xml Fri Apr 11 06:53:58 2008
@@ -22,7 +22,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.wicket</groupId>
-		<artifactId>wicket-jdk15</artifactId>
+		<artifactId>wicket-parent</artifactId>
 		<version>1.4-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

Copied: wicket/trunk/wicket-extensions/pom.xml (from r647166, wicket/trunk/jdk-1.4/wicket-extensions/pom.xml)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/pom.xml?p2=wicket/trunk/wicket-extensions/pom.xml&p1=wicket/trunk/jdk-1.4/wicket-extensions/pom.xml&r1=647166&r2=647167&rev=647167&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/pom.xml (original)
+++ wicket/trunk/wicket-extensions/pom.xml Fri Apr 11 06:53:58 2008
@@ -22,7 +22,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.wicket</groupId>
-		<artifactId>wicket-jdk14</artifactId>
+		<artifactId>wicket-parent</artifactId>
 		<version>1.4-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

Copied: wicket/trunk/wicket-guice/pom.xml (from r647166, wicket/trunk/jdk-1.5/wicket-guice/pom.xml)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-guice/pom.xml?p2=wicket/trunk/wicket-guice/pom.xml&p1=wicket/trunk/jdk-1.5/wicket-guice/pom.xml&r1=647166&r2=647167&rev=647167&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-guice/pom.xml (original)
+++ wicket/trunk/wicket-guice/pom.xml Fri Apr 11 06:53:58 2008
@@ -22,7 +22,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.wicket</groupId>
-		<artifactId>wicket-jdk15</artifactId>
+		<artifactId>wicket-parent</artifactId>
 		<version>1.4-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

Copied: wicket/trunk/wicket-ioc/pom.xml (from r647166, wicket/trunk/jdk-1.4/wicket-ioc/pom.xml)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-ioc/pom.xml?p2=wicket/trunk/wicket-ioc/pom.xml&p1=wicket/trunk/jdk-1.4/wicket-ioc/pom.xml&r1=647166&r2=647167&rev=647167&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-ioc/pom.xml (original)
+++ wicket/trunk/wicket-ioc/pom.xml Fri Apr 11 06:53:58 2008
@@ -22,7 +22,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.wicket</groupId>
-		<artifactId>wicket-jdk14</artifactId>
+		<artifactId>wicket-parent</artifactId>
 		<version>1.4-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

Copied: wicket/trunk/wicket-jmx/pom.xml (from r647166, wicket/trunk/jdk-1.5/wicket-jmx/pom.xml)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-jmx/pom.xml?p2=wicket/trunk/wicket-jmx/pom.xml&p1=wicket/trunk/jdk-1.5/wicket-jmx/pom.xml&r1=647166&r2=647167&rev=647167&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-jmx/pom.xml (original)
+++ wicket/trunk/wicket-jmx/pom.xml Fri Apr 11 06:53:58 2008
@@ -22,7 +22,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.wicket</groupId>
-		<artifactId>wicket-jdk15</artifactId>
+		<artifactId>wicket-parent</artifactId>
 		<version>1.4-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

Copied: wicket/trunk/wicket-objectssizeof-agent/pom.xml (from r647166, wicket/trunk/jdk-1.5/wicket-objectssizeof-agent/pom.xml)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-objectssizeof-agent/pom.xml?p2=wicket/trunk/wicket-objectssizeof-agent/pom.xml&p1=wicket/trunk/jdk-1.5/wicket-objectssizeof-agent/pom.xml&r1=647166&r2=647167&rev=647167&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-objectssizeof-agent/pom.xml (original)
+++ wicket/trunk/wicket-objectssizeof-agent/pom.xml Fri Apr 11 06:53:58 2008
@@ -20,7 +20,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.wicket</groupId>
-		<artifactId>wicket-jdk15</artifactId>
+		<artifactId>wicket-parent</artifactId>
 		<version>1.4-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

Copied: wicket/trunk/wicket-quickstart/pom.xml (from r647166, wicket/trunk/jdk-1.4/wicket-quickstart/pom.xml)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-quickstart/pom.xml?p2=wicket/trunk/wicket-quickstart/pom.xml&p1=wicket/trunk/jdk-1.4/wicket-quickstart/pom.xml&r1=647166&r2=647167&rev=647167&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-quickstart/pom.xml (original)
+++ wicket/trunk/wicket-quickstart/pom.xml Fri Apr 11 06:53:58 2008
@@ -22,7 +22,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.wicket</groupId>
-		<artifactId>wicket-jdk14</artifactId>
+		<artifactId>wicket-parent</artifactId>
 		<version>1.4-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

Copied: wicket/trunk/wicket-spring-annot/pom.xml (from r647166, wicket/trunk/jdk-1.5/wicket-spring-annot/pom.xml)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-spring-annot/pom.xml?p2=wicket/trunk/wicket-spring-annot/pom.xml&p1=wicket/trunk/jdk-1.5/wicket-spring-annot/pom.xml&r1=647166&r2=647167&rev=647167&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-spring-annot/pom.xml (original)
+++ wicket/trunk/wicket-spring-annot/pom.xml Fri Apr 11 06:53:58 2008
@@ -22,7 +22,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.wicket</groupId>
-		<artifactId>wicket-jdk15</artifactId>
+		<artifactId>wicket-parent</artifactId>
 		<version>1.4-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

Copied: wicket/trunk/wicket-spring/pom.xml (from r647166, wicket/trunk/jdk-1.4/wicket-spring/pom.xml)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/pom.xml?p2=wicket/trunk/wicket-spring/pom.xml&p1=wicket/trunk/jdk-1.4/wicket-spring/pom.xml&r1=647166&r2=647167&rev=647167&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-spring/pom.xml (original)
+++ wicket/trunk/wicket-spring/pom.xml Fri Apr 11 06:53:58 2008
@@ -22,7 +22,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.wicket</groupId>
-		<artifactId>wicket-jdk14</artifactId>
+		<artifactId>wicket-parent</artifactId>
 		<version>1.4-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

Copied: wicket/trunk/wicket-velocity/pom.xml (from r647166, wicket/trunk/jdk-1.4/wicket-velocity/pom.xml)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-velocity/pom.xml?p2=wicket/trunk/wicket-velocity/pom.xml&p1=wicket/trunk/jdk-1.4/wicket-velocity/pom.xml&r1=647166&r2=647167&rev=647167&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-velocity/pom.xml (original)
+++ wicket/trunk/wicket-velocity/pom.xml Fri Apr 11 06:53:58 2008
@@ -22,7 +22,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.wicket</groupId>
-		<artifactId>wicket-jdk14</artifactId>
+		<artifactId>wicket-parent</artifactId>
 		<version>1.4-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

Copied: wicket/trunk/wicket/pom.xml (from r647166, wicket/trunk/jdk-1.4/wicket/pom.xml)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/pom.xml?p2=wicket/trunk/wicket/pom.xml&p1=wicket/trunk/jdk-1.4/wicket/pom.xml&r1=647166&r2=647167&rev=647167&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/pom.xml (original)
+++ wicket/trunk/wicket/pom.xml Fri Apr 11 06:53:58 2008
@@ -22,7 +22,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.wicket</groupId>
-		<artifactId>wicket-jdk14</artifactId>
+		<artifactId>wicket-parent</artifactId>
 		<version>1.4-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>