The next steps towards making it deployable on the central maven repo.

Moved repository settings to the specific projects (toplink essentials,
eclipse-link, hibernate) where they belong.

Temporarily downgraded hibernate support to version 3.4.0 GA and
removed the repo setting so at least hibernate support can be put on
maven central.

diff --git a/gps/pom.xml b/gps/pom.xml
index edeb0a8d0b3625030116e8f1b6a60219c5b1f2b0..4ea80e67ea86e44a458b0c2d8dc38de2bfa7b6e9 100644 (file)
--- a/gps/pom.xml
+++ b/gps/pom.xml
@@ -4,7 +4,7 @@
 
   <parent>
     <groupId>org.wamblee</groupId>
-    <artifactId>wamblee-crawler</artifactId>
+    <artifactId>wamblee-utils</artifactId>
     <version>0.2-SNAPSHOT</version>
   </parent>
 

diff --git a/hibernate-jpa/pom.xml b/hibernate-jpa/pom.xml
index 8d10e1009c5aaa94c935605d3209c3093e3ea467..5852114bd68ec040243959e180cca9fc10500308 100644 (file)
--- a/hibernate-jpa/pom.xml
+++ b/hibernate-jpa/pom.xml
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-entitymanager</artifactId>
-      <version>3.5.0-Final</version>
+      <version>3.4.0.GA</version>
       <exclusions>
         <exclusion>
           <groupId>javax.transaction</groupId>
@@ -37,12 +37,12 @@
    
   </dependencies>
   
-  <repositories>
+  <!-- repositories>
     <repository>
       <id>jboss</id>
       <name>JBoss Repo</name>
       <url>http://repository.jboss.org/maven2</url>
     </repository>
-  </repositories>
+  </repositories-->
 
 </project>

diff --git a/mythtv/monitor/pom.xml b/mythtv/monitor/pom.xml
index b7f9d39598b280e340ac636b7a775863675ef5bd..56013fe9ff3ca7fd59049f9f90d7cb769af54298 100644 (file)
--- a/mythtv/monitor/pom.xml
+++ b/mythtv/monitor/pom.xml
@@ -40,7 +40,7 @@
       <version>0.2-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>javaee</groupId>
+      <groupId>javax</groupId>
       <artifactId>javaee-api</artifactId>
     </dependency>
   </dependencies>

diff --git a/mythtv/timer/pom.xml b/mythtv/timer/pom.xml
index 8ebfa99ad58f533ce47000f17bc47980539c8ad6..0dc104a7a0bea46f1651ad80661b0480d3e93df7 100644 (file)
--- a/mythtv/timer/pom.xml
+++ b/mythtv/timer/pom.xml
@@ -22,7 +22,7 @@
         <version>${project.version}</version>
     </dependency>
     <dependency>
-        <groupId>javaee</groupId>
+        <groupId>javax</groupId>
         <artifactId>javaee-api</artifactId>
     </dependency>
   </dependencies>

diff --git a/mythtv/war/pom.xml b/mythtv/war/pom.xml
index b239c3bca0549375ed7b113c354306097102b050..a602a78c4639054fc6037820f33612417dd67821 100644 (file)
--- a/mythtv/war/pom.xml
+++ b/mythtv/war/pom.xml
@@ -22,7 +22,7 @@
         <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>javaee</groupId>
+      <groupId>javax</groupId>
       <artifactId>javaee-api</artifactId>
     </dependency>
   </dependencies>

diff --git a/pom.xml b/pom.xml
index 24fcd42a037f5ce37889c8179c84797b4c2ebe61..04c79d8de53126395b9a1de87529746b9dd24488 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -25,10 +25,7 @@
         <module>system</module>
         <module>hibernate-jpa</module>
         <module>security</module>
-        <module>socketproxy</module>
-        <module>crawler</module>
         <module>gps</module>
-        <module>mythtv</module>
     </modules>
     <dependencies>
         <dependency>
@@ -302,9 +299,9 @@
             </dependency>
 
             <dependency>
-                <groupId>javaee</groupId>
+                <groupId>javax</groupId>
                 <artifactId>javaee-api</artifactId>
-                <version>5</version>
+                <version>6.0</version>
                 <scope>provided</scope>
             </dependency>
 
@@ -486,23 +483,14 @@
         </plugins>
     </reporting>
 
-    <repositories>
-        <repository>
-            <id>javaee</id>
-            <name>Java EE repo at SUN</name>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository>
-        <repository>
-            <id>EclipseLink Repo</id>
-            <url>http://www.eclipse.org/downloads/download.php?r=1&amp;nf=1&amp;file=/rt/eclipselink/maven.repo</url>
-        </repository>
-
-    </repositories>
-
     <profiles>
         <profile>
             <id>release</id>
+            <activation>
+                <property>
+                    <name>wamblee.release</name>
+                </property>
+            </activation>
             <build>
                 <plugins>
                     <plugin>
@@ -521,6 +509,19 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>all</id>
+            <activation>
+                <property>
+                    <name>!wamblee.release</name>
+                </property>
+            </activation>
+                       <modules>
+              <module>socketproxy</module>
+              <module>crawler</module>
+              <module>mythtv</module>
+                   </modules>
+        </profile>
     </profiles>
 
 

diff --git a/support/pom.xml b/support/pom.xml
index 634b1942be8fc08c485b075ce1cb23160b2d9a60..b5e0b78a61b30895b84effad39d750ac25688be4 100644 (file)
--- a/support/pom.xml
+++ b/support/pom.xml
@@ -17,7 +17,8 @@
 
   <modules>
     <module>general</module>
-    <module>spring</module>
     <module>test</module>
+    <module>spring</module>
   </modules>
+  
 </project>

diff --git a/support/test/eclipselink/pom.xml b/support/test/eclipselink/pom.xml
index 271d05a24f2286d45b9cb2e8e3dd716062f8d189..07eef75e3eb8b5eec340bf3e60591ffb95ccd97f 100644 (file)
--- a/support/test/eclipselink/pom.xml
+++ b/support/test/eclipselink/pom.xml
@@ -46,4 +46,13 @@
 
   </dependencies>
 
+   <repositories>
+        <repository>
+            <id>EclipseLink Repo</id>
+            <url>http://www.eclipse.org/downloads/download.php?r=1&amp;nf=1&amp;file=/rt/eclipselink/maven.repo</url>
+        </repository>
+
+    </repositories>
+
+
 </project>

diff --git a/support/test/pom.xml b/support/test/pom.xml
index 1a2617fc17019d4584d394d14a8b14406acec8e2..2bd630263a22bce320f03dbc94793f320b41aaf9 100644 (file)
--- a/support/test/pom.xml
+++ b/support/test/pom.xml
@@ -18,7 +18,21 @@
   <modules>
     <module>enterprise</module>
     <module>hibernate</module>
-       <module>eclipselink</module>
-       <module>toplink-essentials</module>
   </modules>
+
+  <profiles>
+    <profile>
+      <id>all</id>
+      <activation>
+        <property>
+          <name>!wamblee.release</name>
+        </property>
+      </activation>
+      <modules>
+        <module>eclipselink</module>
+        <module>toplink-essentials</module>
+      </modules>
+    </profile>
+  </profiles>
+
 </project>

diff --git a/support/test/toplink-essentials/pom.xml b/support/test/toplink-essentials/pom.xml
index 07af9267f8d0ec5be6189212a13b2862dd20b91b..799ca44c59a4afa878510e67f1368e7f40542b14 100644 (file)
--- a/support/test/toplink-essentials/pom.xml
+++ b/support/test/toplink-essentials/pom.xml
@@ -47,4 +47,14 @@
 
   </dependencies>
 
+    <repositories>
+        <repository>
+            <id>javaee</id>
+            <name>Java EE repo at SUN</name>
+            <url>http://download.java.net/maven/1</url>
+            <layout>legacy</layout>
+        </repository>
+
+    </repositories>
+
 </project>

diff --git a/system/pom.xml b/system/pom.xml
index b9c5a5c9eef132766f0a7f7f833534729d1b2539..800e00756ce02b889b29435e5853c6a55fd0d1a6 100644 (file)
--- a/system/pom.xml
+++ b/system/pom.xml
@@ -18,4 +18,5 @@
     <module>general</module>
     <module>spring</module>
   </modules>
+  
 </project>

diff --git a/system/spring/src/test/java/org/wamblee/system/spring/SubSpringComponent.java b/system/spring/src/test/java/org/wamblee/system/spring/SubSpringComponent.java
index 16279e0cc82531f452e8f03516bd2b8a91a5707d..5e79a7adaa72c04cc2d890734009cdd6b0bf4dde 100644 (file)
--- a/system/spring/src/test/java/org/wamblee/system/spring/SubSpringComponent.java
+++ b/system/spring/src/test/java/org/wamblee/system/spring/SubSpringComponent.java
@@ -17,7 +17,6 @@ package org.wamblee.system.spring;
 
 import java.util.Map;
 
-import net.sf.cglib.transform.impl.AddStaticInitTransformer;
 
 import org.wamblee.system.core.DefaultProvidedInterface;
 import org.wamblee.system.core.ProvidedInterface;