geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r830529 - in /geronimo/server/trunk: ./ plugins/clustering/geronimo-deploy-farm/ plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/ plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/ger...
Date Wed, 28 Oct 2009 13:30:14 GMT
Author: rickmcguire
Date: Wed Oct 28 13:30:12 2009
New Revision: 830529

URL: http://svn.apache.org/viewvc?rev=830529&view=rev
Log:
changes to get openjpa2 to build

Modified:
    geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/pom.xml
    geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicClusterConfigurationController.java
    geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/DeploymentExtendedJMXConnectorInfoEditor.java
    geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/MasterConfigurationStoreTest.java
    geronimo/server/trunk/plugins/clustering/geronimo-farm/pom.xml
    geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/config/BasicExtendedJMXConnectorInfoEditor.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/pom.xml
    geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openjpa2/geronimo-openjpa2/src/main/java/org/apache/geronimo/openjpa/ConfigurationMonitorGBean.java
    geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java
    geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/pom.xml
    geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openjpa2/pom.xml
    geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/pom.xml?rev=830529&r1=830528&r2=830529&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/pom.xml Wed Oct 28 13:30:12
2009
@@ -27,12 +27,12 @@
         <artifactId>clustering</artifactId>
         <version>3.0-SNAPSHOT</version>
     </parent>
-    
+
     <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-deploy-farm</artifactId>
     <packaging>bundle</packaging>
     <name>Geronimo Plugins, Clustering :: Farm using Deployment</name>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
@@ -62,7 +62,15 @@
             <artifactId>geronimo-service-builder</artifactId>
             <version>${version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${version}</version>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
-    
+
 </project>
 

Modified: geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicClusterConfigurationController.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicClusterConfigurationController.java?rev=830529&r1=830528&r2=830529&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicClusterConfigurationController.java
(original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicClusterConfigurationController.java
Wed Oct 28 13:30:12 2009
@@ -27,6 +27,7 @@
 import org.apache.geronimo.gbean.annotation.GBean;
 import org.apache.geronimo.gbean.annotation.ParamAttribute;
 import org.apache.geronimo.gbean.annotation.ParamReference;
+import org.apache.geronimo.kernel.GBeanNotFoundException;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.config.ConfigurationManager;
 import org.apache.geronimo.kernel.config.ConfigurationUtil;
@@ -39,7 +40,7 @@
 @GBean(j2eeType=BasicClusterConfigurationController.GBEAN_J2EE_TYPE)
 public class BasicClusterConfigurationController implements GBeanLifecycle, ClusterConfigurationController
{
     private static final Logger log = LoggerFactory.getLogger(BasicClusterConfigurationController.class);
-    
+
     private final ClusterInfo clusterInfo;
     private final String nodeName;
     private final Artifact artifact;
@@ -80,7 +81,7 @@
             }
         }
     }
-    
+
     public void doFail() {
         try {
             stopConfiguration();
@@ -103,9 +104,9 @@
             if (!nodeInfo.getName().equals(nodeName)) {
                 continue;
             }
-            
+
             Kernel kernel = nodeInfo.newKernel();
-            
+
             ConfigurationManager configurationManager = newConfigurationManager(kernel);
             if (!configurationManager.isLoaded(artifact)) {
                 configurationManager.loadConfiguration(artifact);
@@ -119,15 +120,15 @@
             if (!nodeInfo.getName().equals(nodeName)) {
                 continue;
             }
-            
+
             Kernel kernel = nodeInfo.newKernel();
-            
+
             ConfigurationManager configurationManager = newConfigurationManager(kernel);
             configurationManager.stopConfiguration(artifact);
         }
     }
-    
-    protected ConfigurationManager newConfigurationManager(Kernel kernel) {
+
+    protected ConfigurationManager newConfigurationManager(Kernel kernel) throws GBeanNotFoundException
{
         return ConfigurationUtil.getConfigurationManager(kernel);
     }
 

Modified: geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/DeploymentExtendedJMXConnectorInfoEditor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/DeploymentExtendedJMXConnectorInfoEditor.java?rev=830529&r1=830528&r2=830529&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/DeploymentExtendedJMXConnectorInfoEditor.java
(original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/DeploymentExtendedJMXConnectorInfoEditor.java
Wed Oct 28 13:30:12 2009
@@ -21,6 +21,7 @@
 
 import org.apache.geronimo.deployment.service.JavaBeanXmlAttributeEditor;
 import org.apache.geronimo.farm.config.BasicExtendedJMXConnectorInfo;
+import org.osgi.framework.Bundle;
 
 /**
  *
@@ -28,8 +29,8 @@
  */
 public class DeploymentExtendedJMXConnectorInfoEditor extends JavaBeanXmlAttributeEditor
{
 
-    public DeploymentExtendedJMXConnectorInfoEditor() {
-        super(DeploymentExtendedJMXConnectorInfo.class);
+    public DeploymentExtendedJMXConnectorInfoEditor(Bundle bundle) {
+        super(DeploymentExtendedJMXConnectorInfo.class, bundle);
     }
 
 }

Modified: geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/MasterConfigurationStoreTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/MasterConfigurationStoreTest.java?rev=830529&r1=830528&r2=830529&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/MasterConfigurationStoreTest.java
(original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/MasterConfigurationStoreTest.java
Wed Oct 28 13:30:12 2009
@@ -42,6 +42,7 @@
 import org.apache.geronimo.kernel.config.ConfigurationStore;
 import org.apache.geronimo.kernel.config.InvalidConfigException;
 import org.apache.geronimo.kernel.config.NoSuchConfigException;
+import org.apache.geronimo.kernel.osgi.MockBundle;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.kernel.repository.WritableListableRepository;
@@ -75,7 +76,7 @@
         configId = new Artifact("groupId", "artifactId", "2.0", "car");
         clusterInfoName = new AbstractName(configId, Collections.singletonMap("name", "ClusterInfo"));
         modify().returnValue(clusterInfoName);
-        
+
         delegate = (ConfigurationStore) mock(ConfigurationStore.class);
         nameBuilder = (ConfigurationNameBuilder) mock(ConfigurationNameBuilder.class);
     }
@@ -101,26 +102,26 @@
             }
         };
     }
-    
+
     public void testContainsConfigurationOK() throws Exception {
         nameBuilder.isMasterConfigurationName(configId);
         modify().returnValue(true);
 
         delegate.containsConfiguration(configId);
         modify().returnValue(true);
-        
+
         startVerification();
-        
+
         MasterConfigurationStore store = newMasterConfigurationStore();
         assertTrue(store.containsConfiguration(configId));
     }
-    
+
     public void testContainsConfigurationFailsWhenNotMasterConfigId() throws Exception {
         nameBuilder.isMasterConfigurationName(configId);
         modify().returnValue(false);
 
         startVerification();
-        
+
         MasterConfigurationStore store = newMasterConfigurationStore();
         assertFalse(store.containsConfiguration(configId));
     }
@@ -129,19 +130,19 @@
         delegate.createNewConfigurationDir(configId);
         File expectedFile = new File("confDir");
         modify().returnValue(expectedFile);
-        
+
         startVerification();
-        
+
         MasterConfigurationStore store = newMasterConfigurationStore();
         assertSame(expectedFile, store.createNewConfigurationDir(configId));
     }
-    
+
     public void testExportFailsWhenNotMasterConfigId() throws Exception {
         nameBuilder.isMasterConfigurationName(configId);
         modify().returnValue(false);
 
         startVerification();
-        
+
         MasterConfigurationStore store = newMasterConfigurationStore();
         try {
             store.exportConfiguration(configId, null);
@@ -149,17 +150,17 @@
         } catch (NoSuchConfigException e) {
         }
     }
-    
+
     public void testDelegateExport() throws Exception {
         OutputStream out = new ByteArrayOutputStream();
-        
+
         nameBuilder.isMasterConfigurationName(configId);
         modify().returnValue(true);
-        
+
         delegate.exportConfiguration(configId, out);
-        
+
         startVerification();
-        
+
         MasterConfigurationStore store = newMasterConfigurationStore();
         store.exportConfiguration(configId, out);
     }
@@ -167,30 +168,30 @@
     public void testDelegateGetAbstractName() throws Exception {
         delegate.getAbstractName();
         modify().returnValue(clusterInfoName);
-        
+
         startVerification();
-        
+
         MasterConfigurationStore store = newMasterConfigurationStore();
         assertSame(clusterInfoName, store.getAbstractName());
     }
-    
+
     public void testDelegateGetObjectName() throws Exception {
         String expectedName = "name";
         delegate.getObjectName();
         modify().returnValue(expectedName);
-        
+
         startVerification();
-        
+
         MasterConfigurationStore store = newMasterConfigurationStore();
         assertSame(expectedName, store.getObjectName());
     }
-    
+
     public void testIsInPlaceConfigurationWhenNotMasterConfigId() throws Exception {
         nameBuilder.isMasterConfigurationName(configId);
         modify().returnValue(false);
 
         startVerification();
-        
+
         MasterConfigurationStore store = newMasterConfigurationStore();
         try {
             store.isInPlaceConfiguration(configId);
@@ -202,34 +203,34 @@
     public void testIsInPlaceConfigurationReturnsFalse() throws Exception {
         nameBuilder.isMasterConfigurationName(configId);
         modify().returnValue(true);
-        
+
         startVerification();
-        
+
         MasterConfigurationStore store = newMasterConfigurationStore();
         assertFalse(store.isInPlaceConfiguration(configId));
     }
-    
+
     public void testListConfigurationFilterNoneMasterConfigIds() throws Exception {
         List<ConfigurationInfo> configurationInfos = new ArrayList<ConfigurationInfo>();
 
         ConfigurationInfo configurationInfo =  newConfigurationInfo(configId);
         configurationInfos.add(configurationInfo);
-        
+
         Artifact configId2 = new Artifact("groupId", "artifactId2", "2.0", "car");
         ConfigurationInfo configurationInfo2 =  newConfigurationInfo(configId2);
         configurationInfos.add(configurationInfo2);
-        
+
         delegate.listConfigurations();
         modify().returnValue(configurationInfos);
-        
+
         nameBuilder.isMasterConfigurationName(configId);
         modify().returnValue(true);
-        
+
         nameBuilder.isMasterConfigurationName(configId2);
         modify().returnValue(false);
-        
+
         startVerification();
-        
+
         MasterConfigurationStore store = newMasterConfigurationStore();
         List<ConfigurationInfo> listedConfigurations = store.listConfigurations();
         assertEquals(1, listedConfigurations.size());
@@ -241,7 +242,7 @@
         modify().returnValue(false);
 
         startVerification();
-        
+
         MasterConfigurationStore store = newMasterConfigurationStore();
         try {
             store.loadConfiguration(configId);
@@ -253,11 +254,11 @@
     public void testDelegateLoadConfiguration() throws Exception {
         nameBuilder.isMasterConfigurationName(configId);
         modify().returnValue(true);
-        
+
         delegate.loadConfiguration(configId);
-        
+
         startVerification();
-        
+
         MasterConfigurationStore store = newMasterConfigurationStore();
         store.loadConfiguration(configId);
     }
@@ -265,9 +266,9 @@
     public void testResolveWhenNotMasterConfigId() throws Exception {
         nameBuilder.isMasterConfigurationName(configId);
         modify().returnValue(false);
-        
+
         startVerification();
-        
+
         MasterConfigurationStore store = newMasterConfigurationStore();
         try {
             store.resolve(configId, null, null);
@@ -275,44 +276,44 @@
         } catch (NoSuchConfigException e) {
         }
     }
-    
+
     public void testDelegateResolve() throws Exception {
         nameBuilder.isMasterConfigurationName(configId);
         modify().returnValue(true);
-        
+
         delegate.resolve(configId, null, null);
-        
+
         startVerification();
-        
+
         MasterConfigurationStore store = newMasterConfigurationStore();
         store.resolve(configId, null, null);
     }
-    
+
     public void testUninstall() throws Exception {
         nameBuilder.isMasterConfigurationName(configId);
         modify().returnValue(true);
-        
+
         nameBuilder.buildSlaveConfigurationName(configId);
         Artifact slaveId = new Artifact("groupId", "slaveId", "2.0", "car");
         modify().returnValue(slaveId);
 
         storeClient.uninstall(clusterInfo, slaveId);
-        
+
         delegate.uninstall(slaveId);
         delegate.uninstall(configId);
-        
+
         startVerification();
-        
+
         MasterConfigurationStore store = newMasterConfigurationStore();
         store.uninstall(configId);
     }
-    
+
     public void testUninstallWhenNotMasterConfigId() throws Exception {
         nameBuilder.isMasterConfigurationName(configId);
         modify().returnValue(false);
-        
+
         startVerification();
-        
+
         MasterConfigurationStore store = newMasterConfigurationStore();
         try {
             store.uninstall(configId);
@@ -320,7 +321,7 @@
         } catch (NoSuchConfigException e) {
         }
     }
-    
+
     public void testInstallOK() throws Exception {
         final ConfigurationData configurationData = new ConfigurationData(ConfigurationModuleType.CAR,
             new LinkedHashSet(),
@@ -330,11 +331,11 @@
             new File("configurationDir"),
             null,
             new Jsr77Naming());
-        
+
         AbstractExpression assertConfigurationData = new AbstractExpression() {
             public void describeWith(ExpressionDescriber arg) throws IOException {
             }
-            
+
             public boolean passes(Object arg) {
                 assertSame(configurationData, arg);
                 return true;
@@ -343,12 +344,12 @@
 
         storeClient.install(clusterInfo, configurationData);
         modify().args(is.AS_RECORDED, assertConfigurationData);
-        
+
         delegate.install(configurationData);
         modify().args(assertConfigurationData);
-        
+
         recordInstallMasterConfiguration();
-        
+
         startVerification();
 
         MasterConfigurationStore store = newMasterConfigurationStore();
@@ -359,18 +360,18 @@
         final Artifact masterId = new Artifact("groupId", "masterId", "2.0", "car");
         nameBuilder.buildMasterConfigurationName(configId);
         modify().returnValue(masterId);
-        
+
         NodeInfo nodeInfo = (NodeInfo) mock(NodeInfo.class);
         nodeInfo.getName();
         final String nodeName = "nodeName";
         modify().multiplicity(expect.from(0)).returnValue(nodeName);
         clusterInfo.getNodeInfos();
         modify().returnValue(Collections.singleton(nodeInfo));
-        
+
         delegate.createNewConfigurationDir(masterId);
         final File masterDir = new File("masterDir");
         modify().returnValue(masterDir);
-        
+
         delegate.install(null);
         modify().args(new AbstractExpression() {
             public void describeWith(ExpressionDescriber arg) throws IOException {
@@ -380,10 +381,10 @@
                 ConfigurationData configurationData = (ConfigurationData) arg;
                 assertSame(masterId, configurationData.getId());
                 assertSame(masterDir, configurationData.getConfigurationDir());
-                
+
                 List<GBeanData> gbeans;
                 try {
-                    gbeans = configurationData.getGBeans(getClass().getClassLoader());
+                    gbeans = configurationData.getGBeans(new MockBundle(getClass().getClassLoader(),
"", 0L));
                 } catch (InvalidConfigException e) {
                     throw new AssertionFailedError();
                 }
@@ -396,17 +397,17 @@
             }
         });
     }
-    
+
     private ConfigurationInfo newConfigurationInfo(Artifact configId) {
         return new ConfigurationInfo(
-            clusterInfoName, 
+            clusterInfoName,
             configId,
             ConfigurationModuleType.CAR,
-            1l, 
-            Collections.EMPTY_SET, 
+            1l,
+            Collections.EMPTY_SET,
             Collections.EMPTY_SET,
             null);
     }
-    
-    
+
+
 }

Modified: geronimo/server/trunk/plugins/clustering/geronimo-farm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-farm/pom.xml?rev=830529&r1=830528&r2=830529&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-farm/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-farm/pom.xml Wed Oct 28 13:30:12 2009
@@ -27,12 +27,12 @@
         <artifactId>clustering</artifactId>
         <version>3.0-SNAPSHOT</version>
     </parent>
-    
+
     <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-farm</artifactId>
     <packaging>bundle</packaging>
     <name>Geronimo Plugins, Clustering :: Farm core</name>
-    
+
     <dependencies>
 
         <dependency>
@@ -40,7 +40,7 @@
             <artifactId>geronimo-jmx-remoting</artifactId>
             <version>${version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-service-builder</artifactId>
@@ -48,6 +48,6 @@
         </dependency>
 
     </dependencies>
-    
+
 </project>
 

Modified: geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/config/BasicExtendedJMXConnectorInfoEditor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/config/BasicExtendedJMXConnectorInfoEditor.java?rev=830529&r1=830528&r2=830529&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/config/BasicExtendedJMXConnectorInfoEditor.java
(original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/config/BasicExtendedJMXConnectorInfoEditor.java
Wed Oct 28 13:30:12 2009
@@ -21,14 +21,16 @@
 
 import org.apache.geronimo.deployment.service.JavaBeanXmlAttributeEditor;
 
+import org.osgi.framework.Bundle;
+
 /**
  *
  * @version $Rev:$ $Date:$
  */
 public class BasicExtendedJMXConnectorInfoEditor extends JavaBeanXmlAttributeEditor {
 
-    public BasicExtendedJMXConnectorInfoEditor() {
-        super(BasicExtendedJMXConnectorInfo.class);
+    public BasicExtendedJMXConnectorInfoEditor(Bundle bundle) {
+        super(BasicExtendedJMXConnectorInfo.class, bundle);
     }
 
 }

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/pom.xml?rev=830529&r1=830528&r2=830529&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/pom.xml Wed Oct 28 13:30:12 2009
@@ -27,30 +27,30 @@
         <artifactId>j2ee</artifactId>
         <version>3.0-SNAPSHOT</version>
     </parent>
-    
+
     <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-j2ee-schema</artifactId>
     <packaging>bundle</packaging>
     <name>Geronimo Plugins, J2EE :: Schema</name>
-    
+
     <dependencies>
-        <!-- XmlBeansUtil is needed --> 
+        <!-- XmlBeansUtil is needed -->
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-deployment</artifactId>
             <version>${version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.schema</groupId>
             <artifactId>geronimo-schema-jee_5</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.schema</groupId>
             <artifactId>geronimo-schema-j2ee_1.4</artifactId>

Modified: geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml?rev=830529&r1=830528&r2=830529&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml Wed
Oct 28 13:30:12 2009
@@ -126,4 +126,9 @@
         <artifactId>xmlbeans</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>stax</groupId>
+        <artifactId>stax-api</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/openjpa2/geronimo-openjpa2/src/main/java/org/apache/geronimo/openjpa/ConfigurationMonitorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/geronimo-openjpa2/src/main/java/org/apache/geronimo/openjpa/ConfigurationMonitorGBean.java?rev=830529&r1=830528&r2=830529&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/geronimo-openjpa2/src/main/java/org/apache/geronimo/openjpa/ConfigurationMonitorGBean.java
(original)
+++ geronimo/server/trunk/plugins/openjpa2/geronimo-openjpa2/src/main/java/org/apache/geronimo/openjpa/ConfigurationMonitorGBean.java
Wed Oct 28 13:30:12 2009
@@ -41,12 +41,12 @@
 
 /**
  * Monitor configuration lifecycle events. Whenever a configuration is stopped, inform OpenJPA
that the ClassLoader is no longer needed.
- * 
+ *
  * @version $Rev$ $Date$
  */
 public class ConfigurationMonitorGBean implements GBeanLifecycle {
     private static final Logger log = LoggerFactory.getLogger(ConfigurationMonitorGBean.class);
-    
+
     private final Kernel kernel;
     private final LifecycleListener listener;
     private HashMap<AbstractName,ClassLoader> classLoaderMap = new HashMap<AbstractName,ClassLoader>();
@@ -84,19 +84,20 @@
     }
 
     /**
-     * Cache the ClassLoader for a newly started Configuration.  
+     * Cache the ClassLoader for a newly started Configuration.
      */
     private void configurationRunning(AbstractName name) {
         try {
             Configuration config = (Configuration)kernel.getGBean(name);
-            classLoaderMap.put(name, config.getConfigurationClassLoader());
+// TODO:  This needs to be resolved as to what class loader should be registered
+//          classLoaderMap.put(name, config.getConfigurationClassLoader());
         } catch (GBeanNotFoundException gnfe) {
             log.warn("Could not retrieve GBean for artifact: " + name.toString(), gnfe);
         }
     }
 
     /**
-     * Notify OpenJPA that the ClassLoader will no longer be used. This allows OpenJPA to
free up 
+     * Notify OpenJPA that the ClassLoader will no longer be used. This allows OpenJPA to
free up
      * HARD references that would otherwise prevent Geronimo ClassLoaders from being GCed.
      */
     private void configurationStopped(AbstractName name) {

Modified: geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java?rev=830529&r1=830528&r2=830529&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java
(original)
+++ geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java
Wed Oct 28 13:30:12 2009
@@ -48,6 +48,7 @@
 import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
 import org.apache.geronimo.kernel.Naming;
 import org.apache.geronimo.kernel.config.ConfigurationStore;
+import org.apache.geronimo.kernel.osgi.BundleClassLoader;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.naming.ResourceSource;
 import org.apache.geronimo.persistence.PersistenceUnitGBean;
@@ -56,6 +57,7 @@
 import org.apache.xmlbeans.QNameSet;
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
+import org.osgi.framework.Bundle;
 
 /**
  * @version $Rev$ $Date$
@@ -91,7 +93,7 @@
     public void installModule(JarFile earFile, EARContext earContext, Module module, Collection
configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) throws
DeploymentException {
     }
 
-    public void initContext(EARContext earContext, Module module, ClassLoader cl) throws
DeploymentException {
+    public void initContext(EARContext earContext, Module module, Bundle bundle) throws DeploymentException
{
         XmlObject container = module.getVendorDD();
         EARContext moduleContext = module.getEarContext();
         XmlObject[] raws = container.selectChildren(PERSISTENCE_QNAME);
@@ -158,7 +160,7 @@
                     relative = module.getRelativePath(relative);
                     PersistenceDocument persistenceDocument;
                     try {
-                        XmlObject xmlObject = XmlBeansUtil.parse(persistenceUrl, moduleContext.getClassLoader());
+                        XmlObject xmlObject = XmlBeansUtil.parse(persistenceUrl, new BundleClassLoader(moduleContext.getBundle()));
                         persistenceDocument = (PersistenceDocument) xmlObject.changeType(PersistenceDocument.type);
                     } catch (XmlException e) {
                         throw new DeploymentException("Could not parse persistence.xml file:
" + persistenceUrl, e);
@@ -180,7 +182,7 @@
         }
     }
 
-    public void addGBeans(EARContext earContext, Module module, ClassLoader cl, Collection
repository) throws DeploymentException {
+    public void addGBeans(EARContext earContext, Module module, Bundle bundle, Collection
repository) throws DeploymentException {
     }
 
     private void buildPersistenceUnits(PersistenceDocument.Persistence persistence, Map<String,
PersistenceDocument.Persistence.PersistenceUnit> overrides, Module module, String persistenceModulePath)
throws DeploymentException {

Modified: geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml?rev=830529&r1=830528&r2=830529&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml Wed
Oct 28 13:30:12 2009
@@ -17,6 +17,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>commons-pool</groupId>
+        <artifactId>commons-pool</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>net.sourceforge.serp</groupId>
         <artifactId>serp</artifactId>
         <type>jar</type>
@@ -36,4 +41,9 @@
         <artifactId>openjpa</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/pom.xml?rev=830529&r1=830528&r2=830529&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/pom.xml Wed Oct 28 13:30:12
2009
@@ -21,13 +21,13 @@
 <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>
-    
+
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
         <version>3.0-SNAPSHOT</version>
     </parent>
-    
+
     <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>persistence-jpa20-deployer</artifactId>
     <name>Geronimo Plugins, OpenJPA2 :: Deployer</name>
@@ -56,6 +56,11 @@
             <version>${version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
+        </dependency>
+
         <!--todo get the schema classes in a config -->
         <!--<dependency>-->
         <!--<groupId>org.apache.geronimo.schema</groupId>-->
@@ -66,6 +71,17 @@
     <build>
         <plugins>
             <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <!--packages containing "impl" or "internal" are excluded by default
-->
+                        <Import-Package>org.apache.xmlbeans.impl.schema;version="2.4",*</Import-Package>
+                        <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
+                    </instructions>
+                </configuration>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>

Modified: geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/src/main/history/dependencies.xml?rev=830529&r1=830528&r2=830529&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/src/main/history/dependencies.xml
Wed Oct 28 13:30:12 2009
@@ -11,14 +11,34 @@
         <artifactId>j2ee-deployer</artifactId>
         <type>car</type>
     </dependency>
-    <dependency start="true">
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>transaction-1_6</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-transformer</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-naming-builder</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-persistence-jpa20</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-persistence-jpa20-builder</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/pom.xml?rev=830529&r1=830528&r2=830529&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/pom.xml Wed Oct 28 13:30:12 2009
@@ -36,6 +36,13 @@
         OpenJPA2 plugin
     </description>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
+        </dependency>
+    </dependencies>
+
 <!-- These are in the geronimo-parent PM for now
     <properties>
         <openjpaVersion>2.0.0-M3</openjpaVersion>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/src/main/history/dependencies.xml?rev=830529&r1=830528&r2=830529&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/src/main/history/dependencies.xml
Wed Oct 28 13:30:12 2009
@@ -7,6 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>asm</groupId>
+        <artifactId>asm</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>connector-deployer-1_6</artifactId>
         <type>car</type>
@@ -16,14 +21,24 @@
         <artifactId>j2ee-deployer</artifactId>
         <type>car</type>
     </dependency>
-    <dependency start="true">
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>tomcat6</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-tomcat6</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-tomcat6-builder</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-web-2.5-builder</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=830529&r1=830528&r2=830529&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed Oct 28 13:30:12 2009
@@ -291,6 +291,12 @@
                 <groupId>org.apache.geronimo.schema</groupId>
                 <artifactId>geronimo-schema-jee_5</artifactId>
                 <version>1.2-SNAPSHOT</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.xmlbeans</groupId>
+                        <artifactId>xmlbeans</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <!--
@@ -406,14 +412,6 @@
                         <artifactId>commons-lang</artifactId>
                     </exclusion>
                     <exclusion>
-                        <groupId>commons-collections</groupId>
-                        <artifactId>commons-collections</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>commons-pool</groupId>
-                        <artifactId>commons-pool</artifactId>
-                    </exclusion>
-                    <exclusion>
                         <groupId>org.apache.geronimo.specs</groupId>
                         <artifactId>geronimo-jms_1.1_spec</artifactId>
                     </exclusion>
@@ -921,7 +919,7 @@
             <dependency>
                 <groupId>commons-collections</groupId>
                 <artifactId>commons-collections</artifactId>
-                <version>3.2</version>
+                <version>3.2.1</version>
             </dependency>
 
             <dependency>



Mime
View raw message