From 40d59b891bebb9eb2796eb190c6792dee6e202f2 Mon Sep 17 00:00:00 2001
From: Erik Brakkee <erik@brakkee.org>
Date: Sun, 11 Apr 2010 18:59:40 +0000
Subject: [PATCH] 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.
---
 gps/pom.xml                                   |  2 +-
 hibernate-jpa/pom.xml                         |  6 +--
 mythtv/monitor/pom.xml                        |  2 +-
 mythtv/timer/pom.xml                          |  2 +-
 mythtv/war/pom.xml                            |  2 +-
 pom.xml                                       | 39 ++++++++++---------
 support/pom.xml                               |  3 +-
 support/test/eclipselink/pom.xml              |  9 +++++
 support/test/pom.xml                          | 18 ++++++++-
 support/test/toplink-essentials/pom.xml       | 10 +++++
 system/pom.xml                                |  1 +
 .../system/spring/SubSpringComponent.java     |  1 -
 12 files changed, 65 insertions(+), 30 deletions(-)

diff --git a/gps/pom.xml b/gps/pom.xml
index edeb0a8d..4ea80e67 100644
--- 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 8d10e100..5852114b 100644
--- 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 b7f9d395..56013fe9 100644
--- 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 8ebfa99a..0dc104a7 100644
--- 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 b239c3bc..a602a78c 100644
--- 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 24fcd42a..04c79d8d 100644
--- 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 634b1942..b5e0b78a 100644
--- 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 271d05a2..07eef75e 100644
--- 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 1a2617fc..2bd63026 100644
--- 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 07af9267..799ca44c 100644
--- 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 b9c5a5c9..800e0075 100644
--- 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 16279e0c..5e79a7ad 100644
--- 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;
-- 
2.31.1