push related. changed back to push artifact in jdk-1.5 and push-comet…

…d in jdk-1.6.

git-svn-id: file:///home/igor/dev/stuff/svnbackup/branches/wicketstuff-core-1.4@5565 ef7698a4-5110-0410-9fc6-c7eb3693863f

jdk-1.5-parent/push-parent-jdk-1.5/pom.xml

@@ -35,13 +35,7 @@
 
 
   <modules>
-    <module>push-core</module>
-    <module>push-timer</module>
-    <module>push-dojo</module>
+    <module>push</module>
   </modules>
 
-  <properties>
-    <cometd.version>2.0.0.RC2</cometd.version>
-  </properties>
-
 </project>

jdk-1.5-parent/push-parent-jdk-1.5/push-core/pom.xml → jdk-1.5-parent/push-parent-jdk-1.5/push/pom.xml

@@ -8,11 +8,11 @@
 		<version>1.4.13-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>push-core</artifactId>
+	<artifactId>push</artifactId>
 	<packaging>jar</packaging>
 
 	<name>Wicketstuff Push</name>
-	<description>An integration project for server side pushing in Wicket</description>
+	<description>An integration project for server side pushing in Wicket.  Due to the cometd library depending on Java 6 the cometd implementation is in the push-cometd artifact instead.  We include the timer and dojo implementations.</description>
 	<url>http://wicket-stuff.sourceforge.net/wicket-contrib-cometd</url>
 	<dependencies>
 

jdk-1.6-parent/pom.xml

@@ -18,8 +18,7 @@
 
 	<modules>
 		<module>javaee-inject-parent</module>
-<!--		mocleiri: temporary until the new structure is done. -->
-<!--		<module>push-parent</module>-->
+		<module>push-parent-jdk-1.6</module>
 		<module>wicket-html5-parent</module>
   	</modules>
 

jdk-1.6-parent/push-parent/pom.xml → jdk-1.6-parent/push-parent-jdk-1.6/pom.xml

@@ -7,7 +7,7 @@
     <version>1.4.13-SNAPSHOT</version>
   </parent>
 
-  <artifactId>push-parent</artifactId>
+  <artifactId>push-parent-jdk-1.6</artifactId>
   <packaging>pom</packaging>
 
   <name>Push - Parent</name>
@@ -34,7 +34,7 @@
   </developers>
 
   <modules>
-    <module>push</module>
+    <module>push-cometd</module>
     <module>push-examples</module>
   </modules>
 

jdk-1.6-parent/push-parent/push/pom.xml → jdk-1.6-parent/push-parent-jdk-1.6/push-cometd/pom.xml

@@ -8,11 +8,11 @@
 		<version>1.4.13-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>push</artifactId>
+	<artifactId>push-cometd</artifactId>
 	<packaging>jar</packaging>
 
-	<name>Wicketstuff Push</name>
-	<description>An integration project for server side pushing in Wicket</description>
+	<name>Wicketstuff Push Cometd</name>
+	<description>An integration project for server side pushing in Wicket.  Due to the Java 6 only nature of the cometd artifacts the cometd integration is seperated from the jdk-1.5 push artifact.</description>
 	<url>http://wicket-stuff.sourceforge.net/wicket-contrib-cometd</url>
 	<dependencies>
 
@@ -35,6 +35,12 @@
 			<version>${cometd.version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>org.wicketstuff</groupId>
+			<artifactId>push</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
 	</dependencies>
 
 </project>