geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r828968 - in /geronimo/server/trunk: framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/mock/ plugins/connector-1_6/connector-deployer-1_6/src/main/history/ plugins/connector-1_6/geronimo-connector-builder-1_6/ plugi...
Date Fri, 23 Oct 2009 09:04:53 GMT
Author: djencks
Date: Fri Oct 23 09:04:52 2009
New Revision: 828968

URL: http://svn.apache.org/viewvc?rev=828968&view=rev
Log:
plugins/connector-1_6 builds

Modified:
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/mock/MockConfigurationManager.java
    geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/MessageDestinationTest.java

Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/mock/MockConfigurationManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/mock/MockConfigurationManager.java?rev=828968&r1=828967&r2=828968&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/mock/MockConfigurationManager.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/mock/MockConfigurationManager.java
Fri Oct 23 09:04:52 2009
@@ -24,6 +24,8 @@
 import java.util.Collections;
 import java.util.Collection;
 import java.util.LinkedHashSet;
+import java.util.HashMap;
+import java.util.Map;
 import java.io.IOException;
 
 import org.apache.geronimo.kernel.config.ConfigurationManager;
@@ -37,6 +39,7 @@
 import org.apache.geronimo.kernel.config.LifecycleMonitor;
 import org.apache.geronimo.kernel.config.InvalidConfigException;
 import org.apache.geronimo.kernel.config.ConfigurationResolver;
+import org.apache.geronimo.kernel.config.DependencyNode;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.Version;
 import org.apache.geronimo.kernel.repository.ArtifactResolver;
@@ -50,6 +53,8 @@
  */
 public class MockConfigurationManager implements ConfigurationManager {
 
+    private final Map<Artifact, Configuration> configurations = new HashMap<Artifact,
Configuration>();
+
     public boolean isInstalled(Artifact configurationId) {
         return false;
     }
@@ -95,11 +100,11 @@
     }
 
     public boolean isConfiguration(Artifact artifact) {
-        return false;
+        return configurations.containsKey(artifact);
     }
 
     public Configuration getConfiguration(Artifact configurationId) {
-        return null;
+        return configurations.get(configurationId);
     }
 
     public LifecycleResults loadConfiguration(Artifact configurationId) throws NoSuchConfigException,
LifecycleException {
@@ -107,7 +112,7 @@
     }
 
     public LifecycleResults loadConfiguration(ConfigurationData configurationData) throws
NoSuchConfigException, LifecycleException {
-        return null;
+        return loadConfiguration(configurationData, null);
     }
 
     public LifecycleResults loadConfiguration(Artifact configurationId, LifecycleMonitor
monitor) throws NoSuchConfigException, LifecycleException {
@@ -115,6 +120,13 @@
     }
 
     public LifecycleResults loadConfiguration(ConfigurationData configurationData, LifecycleMonitor
monitor) throws NoSuchConfigException, LifecycleException {
+        try {
+            Artifact configId = configurationData.getEnvironment().getConfigId();
+            Configuration configuration = new Configuration(configurationData, new DependencyNode(configId,
null, null), null, null, null);
+            configurations.put(configId, configuration);
+        } catch (InvalidConfigException e) {
+
+        }
         return null;
     }
 

Modified: geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml?rev=828968&r1=828967&r2=828968&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
Fri Oct 23 09:04:52 2009
@@ -6,19 +6,34 @@
         <version>3.0-SNAPSHOT</version>
         <type>car</type>
     </module-id>
-    <dependency start="true">
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <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 start="true">
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-connector-1_6</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-connector-builder-1_6</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.schema</groupId>
+        <artifactId>geronimo-schema-j2ee_1.4</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml?rev=828968&r1=828967&r2=828968&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml Fri
Oct 23 09:04:52 2009
@@ -88,6 +88,17 @@
             </plugin>
 
             <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.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?rev=828968&r1=828967&r2=828968&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
Fri Oct 23 09:04:52 2009
@@ -385,6 +385,7 @@
     }
 
     public void installModule(JarFile earFile, EARContext earContext, Module module, Collection
configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) throws
DeploymentException {
+        module.setEarContext(earContext);
         try {
             JarFile moduleFile = module.getModuleFile();
 

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java?rev=828968&r1=828967&r2=828968&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
Fri Oct 23 09:04:52 2009
@@ -367,6 +367,7 @@
     }
 
     private void verifyDeployment(ConfigurationData configurationData, ClassLoader cl, AbstractName
moduleAbstractName, String resourceAdapterName, boolean is15, String moduleName) throws Exception
{
+        configurationData.setBundleContext(bundleContext);
         DataSource ds = null;
         try {
 

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/MessageDestinationTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/MessageDestinationTest.java?rev=828968&r1=828967&r2=828968&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/MessageDestinationTest.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/MessageDestinationTest.java
Fri Oct 23 09:04:52 2009
@@ -79,18 +79,9 @@
         Map<String, Artifact> locations = new HashMap<String, Artifact>();
         locations.put(null, artifact);
         BundleContext bundleContext = new MockBundleContext(getClass().getClassLoader(),
"", null, locations);
-        Kernel kernel = new BasicKernel("test", bundleContext);
         Artifact id = new Artifact("test", "test", "", "car");
         module  = new ConnectorModule(false, new AbstractName(id, Collections.singletonMap("name",
"test")), null, null, "foo", null, null, null, null);
-        ConfigurationManager configurationManager = new KernelConfigurationManager(kernel,
-                Collections.<ConfigurationStore>singleton(configStore),
-                null,
-                null,
-                artifactManager,
-                new DefaultArtifactResolver(artifactManager, null), 
-                new HashSet<ListableRepository>(),
-                null,
-                bundleContext);
+        ConfigurationManager configurationManager = new MockConfigurationManager();
         EARContext earContext = new EARContext(new File("foo"),
             null,
             new Environment(artifact),



Mime
View raw message