You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2010/06/24 20:06:33 UTC
svn commit: r957655 [3/15] - in /geronimo/server/trunk: ./
framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/
framework/configs/geronimo-gbean-deployer/src/main/history/
framework/configs/jsr88-cli/src/main/history/ framework/configs...
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=957655&r1=957654&r2=957655&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 Thu Jun 24 18:06:24 2010
@@ -16,7 +16,9 @@
*/
package org.apache.geronimo.connector.deployment;
+import java.io.ByteArrayInputStream;
import java.io.File;
+import java.io.InputStream;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -29,7 +31,6 @@ import org.apache.geronimo.gbean.GBeanDa
import org.apache.geronimo.j2ee.deployment.ConnectorModule;
import org.apache.geronimo.j2ee.deployment.EARContext;
import org.apache.geronimo.j2ee.deployment.Module;
-import org.apache.geronimo.j2ee.deployment.NamingBuilder;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.j2ee.jndi.JndiScope;
import org.apache.geronimo.kernel.Jsr77Naming;
@@ -45,6 +46,8 @@ import org.apache.geronimo.kernel.reposi
import org.apache.geronimo.kernel.repository.DefaultArtifactManager;
import org.apache.geronimo.kernel.repository.Environment;
import org.apache.geronimo.schema.SchemaConversionUtils;
+import org.apache.openejb.jee.JaxbJavaee;
+import org.apache.openejb.jee.WebApp;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
@@ -55,6 +58,8 @@ import org.osgi.framework.BundleContext;
*/
public class MessageDestinationTest extends TestCase {
+ private final ClassLoader classLoader = getClass().getClassLoader();
+
private static final Naming naming = new Jsr77Naming();
protected static MockConfigStore configStore = new MockConfigStore();
@@ -74,7 +79,7 @@ public class MessageDestinationTest exte
locations.put(null, artifact);
BundleContext bundleContext = new MockBundleContext(getClass().getClassLoader(), "", null, locations);
Artifact id = new Artifact("test", "test", "", "car");
- module = new ConnectorModule(false, new AbstractName(id, Collections.singletonMap("name", "test")), null, null, null, "foo", null, null, null, null, null, null);
+ module = new ConnectorModule(false, new AbstractName(id, Collections.singletonMap("name", "test")), null, null, null, "foo", null, null, null, null, null);
ConfigurationManager configurationManager = new MockConfigurationManager();
EARContext earContext = new EARContext(new File("foo"),
null,
@@ -95,7 +100,7 @@ public class MessageDestinationTest exte
baseName = naming.createRootName(configuration.getId(), "testRoot", NameFactory.RESOURCE_ADAPTER_MODULE);
}
- private static final String SPECDD1 = "<tmp xmlns=\"http://java.sun.com/xml/ns/j2ee\">" +
+ private static final String SPECDD1 = "<web-app xmlns=\"http://java.sun.com/xml/ns/j2ee\">" +
"<message-destination><message-destination-name>d1</message-destination-name></message-destination>" +
"<message-destination><message-destination-name>d2</message-destination-name></message-destination>" +
"<message-destination-ref>" +
@@ -110,9 +115,9 @@ public class MessageDestinationTest exte
" <message-destination-usage>Consumes</message-destination-usage>" +
" <message-destination-link>d2</message-destination-link>" +
"</message-destination-ref>" +
- "</tmp>";
+ "</web-app>";
- private static final String PLAN1 = "<tmp xmlns=\"http://geronimo.apache.org/xml/ns/naming-1.2\">" +
+ private static final String PLAN1 = "<web-app xmlns=\"http://geronimo.apache.org/xml/ns/naming-1.2\">" +
"<message-destination>" +
" <message-destination-name>d1</message-destination-name>" +
" <admin-object-link>l1</admin-object-link>" +
@@ -121,10 +126,10 @@ public class MessageDestinationTest exte
" <message-destination-name>d2</message-destination-name>" +
" <admin-object-link>l2</admin-object-link>" +
"</message-destination>" +
- "</tmp>";
+ "</web-app>";
public void testMessageDestinations() throws Exception {
- XmlObject specDD = parse(SPECDD1);
+ WebApp specDD = load(SPECDD1, WebApp.class);
XmlObject plan = parse(PLAN1);
adminObjectRefBuilder.initContext(specDD, plan, module);
AbstractName n1 = naming.createChildName(baseName, "l1", NameFactory.JCA_ADMIN_OBJECT);
@@ -148,7 +153,7 @@ public class MessageDestinationTest exte
"</message-destination>" +
"</tmp>";
public void testMessageDestinationsWithModule() throws Exception {
- XmlObject specDD = parse(SPECDD1);
+ WebApp specDD = load(SPECDD1, WebApp.class);
XmlObject plan = parse(PLAN2);
adminObjectRefBuilder.initContext(specDD, plan, module);
AbstractName n1 = naming.createChildName(baseName, "l1", NameFactory.JCA_ADMIN_OBJECT);
@@ -159,12 +164,12 @@ public class MessageDestinationTest exte
assertEquals(2, module.getJndiScope(JndiScope.comp).size());
}
- private static final String SPECDD2 = "<tmp xmlns=\"http://java.sun.com/xml/ns/j2ee\">" +
- "</tmp>";
+ private static final String SPECDD2 = "<web-app xmlns=\"http://java.sun.com/xml/ns/j2ee\">" +
+ "</web-app>";
public void testMessageDestinationsMatch() throws Exception {
- XmlObject specDD = parse(SPECDD2);
+ WebApp specDD = load(SPECDD2, WebApp.class);
XmlObject plan = parse(PLAN1);
try {
adminObjectRefBuilder.initContext(specDD, plan, module);
@@ -184,6 +189,22 @@ public class MessageDestinationTest exte
xmlCursor.dispose();
}
}
+// private boolean compareXmlObjects(WebApp webApp, XmlObject expected, List problems) throws JAXBException, XmlException {
+// String xml = JaxbJavaee.marshal(WebApp.class, webApp);
+//// log.debug("[Source XML] " + '\n' + xml + '\n');
+//// log.debug("[Expected XML]" + '\n' + expected.toString() + '\n');
+// XmlObject actual = XmlObject.Factory.parse(xml);
+// return compareXmlObjects(actual, expected, problems);
+// }
+
+ private <T> T load(String dd, Class<T> clazz) throws Exception {
+ InputStream in = new ByteArrayInputStream(dd.getBytes());
+ try {
+ return (T) JaxbJavaee.unmarshal(clazz, in);
+ } finally {
+ in.close();
+ }
+ }
}
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/PlanParsingTest.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/PlanParsingTest.java?rev=957655&r1=957654&r2=957655&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/PlanParsingTest.java (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/PlanParsingTest.java Thu Jun 24 18:06:24 2010
@@ -25,7 +25,6 @@ import org.apache.geronimo.schema.Schema
import org.apache.geronimo.testsupport.TestSupport;
import org.apache.geronimo.xbeans.connector.GerConnectorDocument;
import org.apache.geronimo.xbeans.connector.GerConnectorType;
-import org.apache.geronimo.xbeans.javaee6.ConnectorDocument;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
@@ -43,14 +42,14 @@ public class PlanParsingTest extends Tes
XmlBeansUtil.validateDD(connector);
assertEquals(1, connectorDocument.getConnector().getResourceadapterArray().length);
}
-
- public void testLoadJavaEEDeploymentDescriptor() throws Exception {
- URL srcXml = classLoader.getResource("connector_1_6/ra.xml");
- XmlObject plan = XmlBeansUtil.parse(srcXml, getClass().getClassLoader());
- ConnectorDocument connectorDocument = (ConnectorDocument) plan.changeType(ConnectorDocument.type);
- assertNotNull(connectorDocument.getConnector().getResourceadapter());
- XmlBeansUtil.validateDD(connectorDocument);
- }
+ //TODO move to openejb-jee
+// public void testLoadJavaEEDeploymentDescriptor() throws Exception {
+// URL srcXml = classLoader.getResource("connector_1_6/ra.xml");
+// XmlObject plan = XmlBeansUtil.parse(srcXml, getClass().getClassLoader());
+// ConnectorDocument connectorDocument = (ConnectorDocument) plan.changeType(ConnectorDocument.type);
+// assertNotNull(connectorDocument.getConnector().getResourceadapter());
+// XmlBeansUtil.validateDD(connectorDocument);
+// }
public void testLoadGeronimoDeploymentDescriptor15() throws Exception {
URL srcXml = classLoader.getResource("connector_1_6/geronimo-ra.xml");
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation/AnnotationHelperTest.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/annotation/AnnotationHelperTest.java?rev=957655&r1=957654&r2=957655&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation/AnnotationHelperTest.java (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation/AnnotationHelperTest.java Thu Jun 24 18:06:24 2010
@@ -17,6 +17,7 @@
package org.apache.geronimo.connector.deployment.annotation;
+import java.io.InputStream;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.net.URL;
@@ -25,15 +26,15 @@ import java.util.List;
import javax.annotation.Resource;
import javax.annotation.Resources;
-
-import org.apache.geronimo.j2ee.deployment.annotation.ResourceAnnotationHelper;
+import javax.xml.bind.JAXBException;
import org.apache.geronimo.connector.deployment.ResourceRefBuilder;
-import org.apache.geronimo.j2ee.deployment.annotation.AnnotatedWebApp;
+import org.apache.geronimo.j2ee.deployment.annotation.ResourceAnnotationHelper;
import org.apache.geronimo.testsupport.XmlBeansTestSupport;
-import org.apache.geronimo.xbeans.javaee6.WebAppDocument;
-import org.apache.geronimo.xbeans.javaee6.WebAppType;
-import org.apache.xmlbeans.XmlObject;
+import org.apache.openejb.jee.JaxbJavaee;
+import org.apache.openejb.jee.WebApp;
import org.apache.xbean.finder.ClassFinder;
+import org.apache.xmlbeans.XmlException;
+import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlOptions;
/**
@@ -75,12 +76,11 @@ public class AnnotationHelperTest extend
//
// 1. resource-ref
//
- URL srcXML = classLoader.getResource("annotation/empty-web-src.xml");
- XmlObject xmlObject = XmlObject.Factory.parse(srcXML, options);
- WebAppDocument webAppDoc = (WebAppDocument) xmlObject.changeType(WebAppDocument.type);
- WebAppType webApp = webAppDoc.getWebApp();
- AnnotatedWebApp annotatedWebApp = new AnnotatedWebApp(webApp);
- ResourceAnnotationHelper.processAnnotations(annotatedWebApp, classFinder, ResourceRefBuilder.ResourceRefProcessor.INSTANCE);
+// URL srcXML = classLoader.getResource("annotation/empty-web-src.xml");
+// XmlObject xmlObject = XmlObject.Factory.parse(srcXML, options);
+// WebAppDocument webAppDoc = (WebAppDocument) xmlObject.changeType(WebAppDocument.type);
+ WebApp webApp = load("annotation/empty-web-src.xml", WebApp.class);
+ ResourceAnnotationHelper.processAnnotations(webApp, classFinder, ResourceRefBuilder.ResourceRefProcessor.INSTANCE);
URL expectedXML = classLoader.getResource("annotation/resource-ref-expected.xml");
XmlObject expected = XmlObject.Factory.parse(expectedXML);
log.debug("[@Resource <resource-ref> Source XML] " + '\n' + webApp.toString() + '\n');
@@ -89,4 +89,23 @@ public class AnnotationHelperTest extend
boolean ok = compareXmlObjects(webApp, expected, problems);
assertTrue("Differences: " + problems, ok);
}
+
+ private boolean compareXmlObjects(WebApp webApp, XmlObject expected, List problems) throws JAXBException, XmlException {
+ String xml = JaxbJavaee.marshal(WebApp.class, webApp);
+// log.debug("[Source XML] " + '\n' + xml + '\n');
+// log.debug("[Expected XML]" + '\n' + expected.toString() + '\n');
+ XmlObject actual = XmlObject.Factory.parse(xml);
+ return compareXmlObjects(actual, expected, problems);
+ }
+
+ private <T> T load(String url, Class<T> clazz) throws Exception {
+ URL srcXml = classLoader.getResource(url);
+ InputStream in = srcXml.openStream();
+ try {
+ return (T) JaxbJavaee.unmarshal(clazz, in);
+ } finally {
+ in.close();
+ }
+ }
+
}
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/annotation/resource-ref-expected.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/annotation/resource-ref-expected.xml?rev=957655&r1=957654&r2=957655&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/annotation/resource-ref-expected.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/annotation/resource-ref-expected.xml Thu Jun 24 18:06:24 2010
@@ -21,8 +21,8 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
version="2.5" >
- <display-name>Empty web application</display-name>
<description>Empty web application</description>
+ <display-name>Empty web application</display-name>
<resource-ref>
<description>description5</description>
<res-ref-name>Resource5</res-ref-name>
Modified: geronimo/server/trunk/plugins/corba/geronimo-corba-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba-builder/pom.xml?rev=957655&r1=957654&r2=957655&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba-builder/pom.xml Thu Jun 24 18:06:24 2010
@@ -66,8 +66,8 @@
<instructions>
<!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
<Import-Package>
- org.w3.xml.x1998.namespace.impl,
- org.w3.xml.x1998.namespace,
+ <!--org.w3.xml.x1998.namespace.impl,-->
+ <!--org.w3.xml.x1998.namespace,-->
org.apache.xmlbeans.impl.schema;version="2.4",
*
</Import-Package>
Modified: geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaRefBuilder.java?rev=957655&r1=957654&r2=957655&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaRefBuilder.java Thu Jun 24 18:06:24 2010
@@ -20,25 +20,24 @@ package org.apache.geronimo.corba.deploy
import java.util.Collection;
import java.util.Map;
+import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.gbean.AbstractNameQuery;
+import org.apache.geronimo.gbean.SingleElementCollection;
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.j2ee.deployment.CorbaGBeanNameSource;
import org.apache.geronimo.j2ee.deployment.EARContext;
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.QNameSet;
-import org.apache.geronimo.kernel.repository.Artifact;
-import org.apache.geronimo.kernel.repository.Environment;
import org.apache.geronimo.j2ee.deployment.Module;
-import org.apache.geronimo.j2ee.deployment.CorbaGBeanNameSource;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.naming.reference.ORBReference;
-import org.apache.geronimo.naming.reference.HandleDelegateReference;
+import org.apache.geronimo.kernel.repository.Artifact;
+import org.apache.geronimo.kernel.repository.Environment;
import org.apache.geronimo.naming.deployment.AbstractNamingBuilder;
-import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.gbean.AbstractNameQuery;
-import org.apache.geronimo.gbean.SingleElementCollection;
+import org.apache.geronimo.naming.reference.HandleDelegateReference;
+import org.apache.geronimo.naming.reference.ORBReference;
+import org.apache.openejb.jee.JndiConsumer;
+import org.apache.xmlbeans.QNameSet;
+import org.apache.xmlbeans.XmlObject;
/**
* @version $Rev$ $Date$
@@ -54,22 +53,22 @@ public class CorbaRefBuilder extends Abs
this.corbaGBeanNameSourceCollection = new SingleElementCollection<CorbaGBeanNameSource>(corbaGBeanNameSource);
}
- protected boolean willMergeEnvironment(XmlObject specDD, XmlObject plan) throws DeploymentException {
+ protected boolean willMergeEnvironment(JndiConsumer specDD, XmlObject plan) throws DeploymentException {
// if (OpenEjbCorbaRefBuilder.hasCssRefs(plan) || TSSLinkBuilder.hasTssLinks(plan)) {
return true;
// }
// return false;
}
- public void buildNaming(XmlObject specDD, XmlObject plan, Module module, Map<EARContext.Key, Object> sharedContext) throws DeploymentException {
+ public void buildNaming(JndiConsumer specDD, XmlObject plan, Module module, Map<EARContext.Key, Object> sharedContext) throws DeploymentException {
if (matchesDefaultEnvironment(module.getEnvironment())) {
CorbaGBeanNameSource corbaGBeanNameSource = corbaGBeanNameSourceCollection.getElement();
if (corbaGBeanNameSource != null) {
AbstractNameQuery corbaName = corbaGBeanNameSource.getCorbaGBeanName();
if (corbaName != null) {
Artifact[] moduleId = module.getConfigId();
- put("env/ORB", new ORBReference(moduleId, corbaName), module.getJndiContext());
- put("env/HandleDelegate", new HandleDelegateReference(moduleId, corbaName), module.getJndiContext());
+ put("java:comp/ORB", new ORBReference(moduleId, corbaName), module.getJndiContext());
+ put("java:comp/HandleDelegate", new HandleDelegateReference(moduleId, corbaName), module.getJndiContext());
}
}
}
Modified: geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/OpenEjbCorbaRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/OpenEjbCorbaRefBuilder.java?rev=957655&r1=957654&r2=957655&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/OpenEjbCorbaRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/OpenEjbCorbaRefBuilder.java Thu Jun 24 18:06:24 2010
@@ -19,31 +19,29 @@ package org.apache.geronimo.corba.deploy
import java.net.URI;
import java.net.URISyntaxException;
+import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
+
import javax.naming.Reference;
import javax.xml.namespace.QName;
-
import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.corba.proxy.CORBAProxyReference;
import org.apache.geronimo.gbean.AbstractNameQuery;
-import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.annotation.GBean;
import org.apache.geronimo.gbean.annotation.ParamAttribute;
import org.apache.geronimo.j2ee.deployment.EARContext;
import org.apache.geronimo.j2ee.deployment.Module;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.j2ee.jndi.JndiKey;
import org.apache.geronimo.kernel.GBeanNotFoundException;
-import org.apache.geronimo.kernel.config.Configuration;
import org.apache.geronimo.kernel.repository.Environment;
import org.apache.geronimo.openejb.deployment.EjbRefBuilder;
import org.apache.geronimo.schema.NamespaceElementConverter;
import org.apache.geronimo.xbeans.geronimo.naming.GerEjbRefDocument;
import org.apache.geronimo.xbeans.geronimo.naming.GerEjbRefType;
import org.apache.geronimo.xbeans.geronimo.naming.GerPatternType;
-import org.apache.geronimo.xbeans.javaee6.EjbRefType;
-import org.apache.geronimo.corba.proxy.CORBAProxyReference;
+import org.apache.openejb.jee.EjbRef;
+import org.apache.openejb.jee.JndiConsumer;
import org.apache.xmlbeans.QNameSet;
import org.apache.xmlbeans.XmlObject;
import org.osgi.framework.Bundle;
@@ -83,7 +81,7 @@ public class OpenEjbCorbaRefBuilder exte
}
- protected boolean willMergeEnvironment(XmlObject specDD, XmlObject plan) {
+ protected boolean willMergeEnvironment(JndiConsumer specDD, XmlObject plan) {
// return hasCssRefs(plan);
return true;
}
@@ -99,17 +97,16 @@ public class OpenEjbCorbaRefBuilder exte
// return false;
// }
- public void buildNaming(XmlObject specDD, XmlObject plan, Module module, Map<EARContext.Key, Object> sharedContext) throws DeploymentException {
- XmlObject[] ejbRefsUntyped = convert(specDD.selectChildren(ejbRefQNameSet), JEE_CONVERTER, EjbRefType.type);
+ public void buildNaming(JndiConsumer specDD, XmlObject plan, Module module, Map<EARContext.Key, Object> sharedContext) throws DeploymentException {
+ Collection<EjbRef> ejbRefsUntyped = specDD.getEjbRef();
XmlObject[] gerEjbRefsUntyped = plan == null ? NO_REFS : convert(plan.selectChildren(GER_EJB_REF_QNAME_SET), OPENEJB_CONVERTER, GerEjbRefType.type);
Map ejbRefMap = mapEjbRefs(gerEjbRefsUntyped);
Bundle bundle = module.getEarContext().getDeploymentBundle();
- for (XmlObject anEjbRefsUntyped : ejbRefsUntyped) {
- EjbRefType ejbRef = (EjbRefType) anEjbRefsUntyped;
+ for (EjbRef ejbRef : ejbRefsUntyped) {
String ejbRefName = getStringValue(ejbRef.getEjbRefName());
- addInjections(ejbRefName, ejbRef.getInjectionTargetArray(), sharedContext);
+ addInjections(ejbRefName, ejbRef.getInjectionTarget(), sharedContext);
GerEjbRefType remoteRef = (GerEjbRefType) ejbRefMap.get(ejbRefName);
Reference ejbReference = addEJBRef(module, ejbRef, remoteRef, bundle);
@@ -119,7 +116,7 @@ public class OpenEjbCorbaRefBuilder exte
}
}
- private Reference addEJBRef(Module module, EjbRefType ejbRef, GerEjbRefType remoteRef, Bundle bundle) throws DeploymentException {
+ private Reference addEJBRef(Module module, EjbRef ejbRef, GerEjbRefType remoteRef, Bundle bundle) throws DeploymentException {
Reference ejbReference = null;
if (remoteRef != null && remoteRef.isSetNsCorbaloc()) {
String refName = getStringValue(ejbRef.getEjbRefName());
Modified: geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/TSSLinkBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/TSSLinkBuilder.java?rev=957655&r1=957654&r2=957655&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/TSSLinkBuilder.java (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/TSSLinkBuilder.java Thu Jun 24 18:06:24 2010
@@ -22,11 +22,11 @@ package org.apache.geronimo.corba.deploy
import java.net.URI;
import java.util.Map;
-import java.util.Collections;
import javax.xml.namespace.QName;
-
import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.corba.TSSLinkGBean;
+import org.apache.geronimo.corba.xbeans.csiv2.tss.TSSTssDocument;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.AbstractNameQuery;
import org.apache.geronimo.gbean.GBeanData;
@@ -40,8 +40,7 @@ import org.apache.geronimo.kernel.reposi
import org.apache.geronimo.naming.deployment.AbstractNamingBuilder;
import org.apache.geronimo.naming.deployment.ENCConfigBuilder;
import org.apache.geronimo.xbeans.geronimo.naming.GerPatternType;
-import org.apache.geronimo.corba.TSSLinkGBean;
-import org.apache.geronimo.corba.xbeans.csiv2.tss.TSSTssDocument;
+import org.apache.openejb.jee.JndiConsumer;
import org.apache.xmlbeans.QNameSet;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlString;
@@ -62,7 +61,7 @@ public class TSSLinkBuilder extends Abst
super(defaultEnvironment);
}
- protected boolean willMergeEnvironment(XmlObject specDD, XmlObject plan) {
+ protected boolean willMergeEnvironment(JndiConsumer specDD, XmlObject plan) {
return true;
// return hasTssLinks(plan);
}
@@ -72,7 +71,7 @@ public class TSSLinkBuilder extends Abst
// plan.selectChildren(TSS_QNAME).length > 0);
// }
- public void buildNaming(XmlObject specDD, XmlObject plan, Module module, Map componentContext) throws DeploymentException {
+ public void buildNaming(JndiConsumer specDD, XmlObject plan, Module module, Map componentContext) throws DeploymentException {
if (plan == null) {
return;
}
Modified: geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/security/config/css/CSSConfigEditor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/security/config/css/CSSConfigEditor.java?rev=957655&r1=957654&r2=957655&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/security/config/css/CSSConfigEditor.java (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/security/config/css/CSSConfigEditor.java Thu Jun 24 18:06:24 2010
@@ -19,6 +19,8 @@ package org.apache.geronimo.corba.deploy
import java.util.Iterator;
import java.util.List;
+import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.common.propertyeditor.PropertyEditorException;
import org.apache.geronimo.corba.security.config.css.CSSASMechConfig;
import org.apache.geronimo.corba.security.config.css.CSSCompoundSecMechConfig;
import org.apache.geronimo.corba.security.config.css.CSSCompoundSecMechListConfig;
@@ -34,7 +36,20 @@ import org.apache.geronimo.corba.securit
import org.apache.geronimo.corba.security.config.css.CSSSASMechConfig;
import org.apache.geronimo.corba.security.config.css.CSSSSLTransportConfig;
import org.apache.geronimo.corba.security.config.css.CSSTransportMechConfig;
+import org.apache.geronimo.corba.xbeans.csiv2.css.CSSCompoundSecMechType;
+import org.apache.geronimo.corba.xbeans.csiv2.css.CSSCssDocument;
+import org.apache.geronimo.corba.xbeans.csiv2.css.CSSCssType;
+import org.apache.geronimo.corba.xbeans.csiv2.css.CSSGSSUPDynamicType;
+import org.apache.geronimo.corba.xbeans.csiv2.css.CSSGSSUPStaticType;
+import org.apache.geronimo.corba.xbeans.csiv2.css.CSSITTPrincipalNameDynamicType;
+import org.apache.geronimo.corba.xbeans.csiv2.css.CSSITTPrincipalNameStaticType;
+import org.apache.geronimo.corba.xbeans.csiv2.css.CSSSSLType;
+import org.apache.geronimo.corba.xbeans.csiv2.css.CSSSasMechType;
+import org.apache.geronimo.corba.xbeans.csiv2.tss.TSSAssociationOption;
+import org.apache.geronimo.deployment.service.XmlAttributeBuilder;
+import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
import org.apache.geronimo.gbean.annotation.GBean;
+import org.apache.geronimo.kernel.ClassLoading;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
import org.omg.CSIIOP.CompositeDelegation;
@@ -47,25 +62,6 @@ import org.omg.CSIIOP.Integrity;
import org.omg.CSIIOP.NoDelegation;
import org.omg.CSIIOP.NoProtection;
import org.omg.CSIIOP.SimpleDelegation;
-
-import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.common.propertyeditor.PropertyEditorException;
-import org.apache.geronimo.deployment.service.XmlAttributeBuilder;
-import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
-import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.kernel.ClassLoading;
-
-import org.apache.geronimo.corba.xbeans.csiv2.css.CSSCompoundSecMechType;
-import org.apache.geronimo.corba.xbeans.csiv2.css.CSSCssType;
-import org.apache.geronimo.corba.xbeans.csiv2.css.CSSGSSUPDynamicType;
-import org.apache.geronimo.corba.xbeans.csiv2.css.CSSGSSUPStaticType;
-import org.apache.geronimo.corba.xbeans.csiv2.css.CSSITTPrincipalNameDynamicType;
-import org.apache.geronimo.corba.xbeans.csiv2.css.CSSITTPrincipalNameStaticType;
-import org.apache.geronimo.corba.xbeans.csiv2.css.CSSSSLType;
-import org.apache.geronimo.corba.xbeans.csiv2.css.CSSSasMechType;
-import org.apache.geronimo.corba.xbeans.csiv2.css.CSSCssDocument;
-import org.apache.geronimo.corba.xbeans.csiv2.tss.TSSAssociationOption;
import org.osgi.framework.Bundle;
Modified: geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/security/config/tss/TSSConfigEditor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/security/config/tss/TSSConfigEditor.java?rev=957655&r1=957654&r2=957655&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/security/config/tss/TSSConfigEditor.java (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/security/config/tss/TSSConfigEditor.java Thu Jun 24 18:06:24 2010
@@ -19,6 +19,8 @@ package org.apache.geronimo.corba.deploy
import java.util.Iterator;
import java.util.List;
+import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.common.propertyeditor.PropertyEditorException;
import org.apache.geronimo.corba.security.config.tss.TSSASMechConfig;
import org.apache.geronimo.corba.security.config.tss.TSSCompoundSecMechConfig;
import org.apache.geronimo.corba.security.config.tss.TSSCompoundSecMechListConfig;
@@ -36,16 +38,22 @@ import org.apache.geronimo.corba.securit
import org.apache.geronimo.corba.security.config.tss.TSSSASMechConfig;
import org.apache.geronimo.corba.security.config.tss.TSSSSLTransportConfig;
import org.apache.geronimo.corba.security.config.tss.TSSTransportMechConfig;
-import org.apache.geronimo.gbean.annotation.GBean;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlObject;
-import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.common.propertyeditor.PropertyEditorException;
+import org.apache.geronimo.corba.xbeans.csiv2.tss.TSSAssociationOption;
+import org.apache.geronimo.corba.xbeans.csiv2.tss.TSSCompoundSecMechType;
+import org.apache.geronimo.corba.xbeans.csiv2.tss.TSSGSSUPType;
+import org.apache.geronimo.corba.xbeans.csiv2.tss.TSSGeneralNameType;
+import org.apache.geronimo.corba.xbeans.csiv2.tss.TSSGssExportedNameType;
+import org.apache.geronimo.corba.xbeans.csiv2.tss.TSSIdentityTokenTypeList;
+import org.apache.geronimo.corba.xbeans.csiv2.tss.TSSSSLType;
+import org.apache.geronimo.corba.xbeans.csiv2.tss.TSSSasMechType;
+import org.apache.geronimo.corba.xbeans.csiv2.tss.TSSTssDocument;
+import org.apache.geronimo.corba.xbeans.csiv2.tss.TSSTssType;
import org.apache.geronimo.deployment.service.XmlAttributeBuilder;
import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
-import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.annotation.GBean;
import org.apache.geronimo.kernel.ClassLoading;
+import org.apache.xmlbeans.XmlException;
+import org.apache.xmlbeans.XmlObject;
import org.omg.CSIIOP.CompositeDelegation;
import org.omg.CSIIOP.Confidentiality;
import org.omg.CSIIOP.DetectMisordering;
@@ -56,16 +64,6 @@ import org.omg.CSIIOP.Integrity;
import org.omg.CSIIOP.NoDelegation;
import org.omg.CSIIOP.NoProtection;
import org.omg.CSIIOP.SimpleDelegation;
-import org.apache.geronimo.corba.xbeans.csiv2.tss.TSSAssociationOption;
-import org.apache.geronimo.corba.xbeans.csiv2.tss.TSSCompoundSecMechType;
-import org.apache.geronimo.corba.xbeans.csiv2.tss.TSSGSSUPType;
-import org.apache.geronimo.corba.xbeans.csiv2.tss.TSSGeneralNameType;
-import org.apache.geronimo.corba.xbeans.csiv2.tss.TSSGssExportedNameType;
-import org.apache.geronimo.corba.xbeans.csiv2.tss.TSSIdentityTokenTypeList;
-import org.apache.geronimo.corba.xbeans.csiv2.tss.TSSSSLType;
-import org.apache.geronimo.corba.xbeans.csiv2.tss.TSSSasMechType;
-import org.apache.geronimo.corba.xbeans.csiv2.tss.TSSTssDocument;
-import org.apache.geronimo.corba.xbeans.csiv2.tss.TSSTssType;
import org.osgi.framework.Bundle;
Modified: geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml?rev=957655&r1=957654&r2=957655&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml Thu Jun 24 18:06:24 2010
@@ -47,16 +47,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.schema</groupId>
- <artifactId>geronimo-schema-javaee_6</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.schema</groupId>
- <artifactId>geronimo-schema-jee_5</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.1_spec</artifactId>
<type>jar</type>
@@ -82,6 +72,11 @@
<type>jar</type>
</dependency>
<dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-jee</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
<type>jar</type>
Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFServiceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFServiceRefBuilder.java?rev=957655&r1=957654&r2=957655&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFServiceRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFServiceRefBuilder.java Thu Jun 24 18:06:24 2010
@@ -17,12 +17,11 @@
package org.apache.geronimo.cxf.builder;
-import java.io.IOException;
import java.net.URI;
import java.util.Map;
+import javax.xml.bind.JAXBException;
import javax.xml.namespace.QName;
-
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.cxf.client.CXFServiceReference;
import org.apache.geronimo.gbean.GBeanInfo;
@@ -35,8 +34,8 @@ import org.apache.geronimo.jaxws.client.
import org.apache.geronimo.kernel.repository.Environment;
import org.apache.geronimo.naming.deployment.ServiceRefBuilder;
import org.apache.geronimo.xbeans.geronimo.naming.GerServiceRefType;
-import org.apache.geronimo.xbeans.javaee6.PortComponentRefType;
-import org.apache.geronimo.xbeans.javaee6.ServiceRefType;
+import org.apache.openejb.jee.PortComponentRef;
+import org.apache.openejb.jee.ServiceRef;
import org.osgi.framework.Bundle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -49,11 +48,12 @@ public class CXFServiceRefBuilder extend
String[] eeNamespaces) {
super(defaultEnvironment, eeNamespaces);
}
-
- public Object createService(ServiceRefType serviceRef, GerServiceRefType gerServiceRef,
+
+ @Override
+ public Object createService(ServiceRef serviceRef, GerServiceRefType gerServiceRef,
Module module, Bundle bundle, Class serviceInterface,
QName serviceQName, URI wsdlURI, Class serviceReference,
- Map<Class, PortComponentRefType> portComponentRefMap) throws DeploymentException {
+ Map<Class, PortComponentRef> portComponentRefMap) throws DeploymentException {
EndpointInfoBuilder builder = new EndpointInfoBuilder(serviceInterface,
gerServiceRef, portComponentRefMap, module, bundle,
wsdlURI, serviceQName);
@@ -66,7 +66,7 @@ public class CXFServiceRefBuilder extend
String handlerChainsXML = null;
try {
handlerChainsXML = getHandlerChainAsString(serviceRef.getHandlerChains());
- } catch (IOException e) {
+ } catch (JAXBException e) {
// this should not happen
LOG.warn("Failed to serialize handler chains", e);
}
Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf/pom.xml?rev=957655&r1=957654&r2=957655&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf/pom.xml Thu Jun 24 18:06:24 2010
@@ -77,6 +77,10 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle-minimal</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-jee</artifactId>
+ </dependency>
</dependencies>
Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java?rev=957655&r1=957654&r2=957655&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java Thu Jun 24 18:06:24 2010
@@ -44,7 +44,7 @@ import org.apache.geronimo.jaxws.PortInf
import org.apache.geronimo.jaxws.annotations.AnnotationException;
import org.apache.geronimo.jaxws.annotations.AnnotationProcessor;
import org.apache.geronimo.jaxws.handler.GeronimoHandlerResolver;
-import org.apache.geronimo.xbeans.javaee.HandlerChainsType;
+import org.apache.openejb.jee.HandlerChains;
import org.apache.xbean.osgi.bundle.util.BundleUtils;
import org.osgi.framework.Bundle;
@@ -195,8 +195,8 @@ public abstract class CXFEndpoint {
* Set appropriate handlers for the port/service/bindings.
*/
protected void initHandlers() throws Exception {
- HandlerChainsType handlerChains =
- HandlerChainsUtils.getHandlerChains(this.portInfo.getHandlersAsXML());
+ HandlerChains handlerChains =
+ HandlerChainsUtils.toHandlerChains(this.portInfo.getHandlersAsXML(), HandlerChains.class);
GeronimoHandlerResolver handlerResolver = new GeronimoHandlerResolver(bundle, getImplementorClass(), handlerChains, null);
PortInfoImpl portInfo = new PortInfoImpl(implInfo.getBindingType(),
Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/client/CXFServiceReference.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/client/CXFServiceReference.java?rev=957655&r1=957654&r2=957655&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/client/CXFServiceReference.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/client/CXFServiceReference.java Thu Jun 24 18:06:24 2010
@@ -25,6 +25,7 @@ import javax.naming.NamingException;
import javax.xml.namespace.QName;
import javax.xml.ws.handler.HandlerResolver;
+import org.apache.openejb.jee.HandlerChains;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.cxf.Bus;
@@ -40,7 +41,6 @@ import org.apache.geronimo.jaxws.client.
import org.apache.geronimo.jaxws.client.JAXWSServiceReference;
import org.apache.geronimo.jaxws.client.PortMethodInterceptor;
import org.apache.geronimo.jaxws.handler.GeronimoHandlerResolver;
-import org.apache.geronimo.xbeans.javaee.HandlerChainsType;
public class CXFServiceReference extends JAXWSServiceReference {
@@ -77,10 +77,10 @@ public class CXFServiceReference extends
}
}
- protected HandlerChainsType getHandlerChains() {
- HandlerChainsType types = null;
+ protected HandlerChains getHandlerChains() {
+ HandlerChains types = null;
try {
- types = HandlerChainsUtils.getHandlerChains(this.handlerChainsXML);
+ types = HandlerChainsUtils.toHandlerChains(this.handlerChainsXML, HandlerChains.class);
} catch (Exception e) {
LOG.warn("Failed to deserialize handler chains", e);
}
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml?rev=957655&r1=957654&r2=957655&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml Thu Jun 24 18:06:24 2010
@@ -39,7 +39,11 @@
<artifactId>geronimo-j2ee-schema</artifactId>
<version>${project.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-jee</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-service-builder</artifactId>
@@ -122,14 +126,6 @@
<_exportcontents>schemaorg_apache_xmlbeans*</_exportcontents>
<DynamicImport-Package>schemaorg_apache_xmlbeans.*</DynamicImport-Package>
<Import-Package>
- org.apache.geronimo.xbeans.javaee.impl,
- org.apache.geronimo.xbeans.javaee,
- org.apache.geronimo.xbeans.persistence.impl,
- org.apache.geronimo.xbeans.persistence,
- org.apache.geronimo.xbeans.j2ee.impl,
- org.apache.geronimo.xbeans.j2ee,
- org.w3.xml.x1998.namespace.impl,
- org.w3.xml.x1998.namespace,
org.apache.geronimo.deployment.xbeans.impl,
org.apache.geronimo.deployment.javabean.xbeans.impl,
org.apache.geronimo.deployment.xbeans,
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java?rev=957655&r1=957654&r2=957655&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java Thu Jun 24 18:06:24 2010
@@ -16,13 +16,12 @@
*/
package org.apache.geronimo.j2ee.deployment;
-import java.util.Collection;
import java.util.jar.JarFile;
import org.apache.geronimo.gbean.AbstractName;
-import org.apache.geronimo.j2ee.deployment.annotation.AnnotatedApplicationClient;
import org.apache.geronimo.kernel.config.ConfigurationModuleType;
import org.apache.geronimo.kernel.repository.Environment;
+import org.apache.openejb.jee.ApplicationClient;
import org.apache.xmlbeans.XmlObject;
/**
@@ -30,7 +29,7 @@ import org.apache.xmlbeans.XmlObject;
*
* @version $Rev$ $Date$
*/
-public class AppClientModule extends Module<XmlObject, XmlObject> {
+public class AppClientModule extends Module<ApplicationClient, XmlObject> {
private final Environment serverEnvironment;
private JarFile earFile;
private final AbstractName appClientName;
@@ -44,13 +43,12 @@ public class AppClientModule extends Mod
Environment clientEnvironment,
JarFile moduleFile,
String targetPath,
- XmlObject specDD,
+ ApplicationClient specDD,
String mainClassName,
XmlObject vendorDD,
- String originalSpecDD,
- AnnotatedApplicationClient annotatedAppClient ) {
+ String originalSpecDD) {
super(standAlone, moduleName, name, clientEnvironment, moduleFile, targetPath,
- specDD, vendorDD, originalSpecDD, null, annotatedAppClient, null, null);
+ specDD, vendorDD, originalSpecDD, null, null, null);
this.serverEnvironment = serverEnvironment;
this.appClientName = appClientName;
this.mainClassName = mainClassName;
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ApplicationInfo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ApplicationInfo.java?rev=957655&r1=957654&r2=957655&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ApplicationInfo.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ApplicationInfo.java Thu Jun 24 18:06:24 2010
@@ -16,20 +16,18 @@
*/
package org.apache.geronimo.j2ee.deployment;
-import java.util.LinkedHashSet;
import java.util.jar.JarFile;
-import org.apache.geronimo.j2ee.deployment.annotation.AnnotatedApp;
+import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.kernel.config.ConfigurationModuleType;
import org.apache.geronimo.kernel.repository.Environment;
-import org.apache.geronimo.gbean.AbstractName;
-import org.apache.geronimo.deployment.ModuleList;
+import org.apache.openejb.jee.Application;
import org.apache.xmlbeans.XmlObject;
/**
* @version $Revision$ $Date$
*/
-public class ApplicationInfo extends Module<XmlObject, XmlObject> {
+public class ApplicationInfo extends Module<Application, XmlObject> {
private ConfigurationModuleType type;
@@ -38,11 +36,11 @@ public class ApplicationInfo extends Mod
AbstractName baseName,
String name,
JarFile earFile,
- XmlObject specDD,
+ Application specDD,
XmlObject vendorDD,
- String originalSpecDD,
- AnnotatedApp annotatedApp) {
- super(true, baseName, name, environment, earFile, "", specDD, vendorDD, originalSpecDD, null, annotatedApp, null, null);
+ String originalSpecDD
+ ) {
+ super(true, baseName, name, environment, earFile, "", specDD, vendorDD, originalSpecDD, null, null, null);
assert type != null;
assert environment != null;
assert modules != null;
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java?rev=957655&r1=957654&r2=957655&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java Thu Jun 24 18:06:24 2010
@@ -20,7 +20,6 @@ import java.util.Map;
import java.util.jar.JarFile;
import org.apache.geronimo.gbean.AbstractName;
-import org.apache.geronimo.j2ee.deployment.annotation.AnnotatedApp;
import org.apache.geronimo.j2ee.jndi.JndiKey;
import org.apache.geronimo.kernel.config.ConfigurationModuleType;
import org.apache.geronimo.kernel.repository.Environment;
@@ -39,11 +38,10 @@ public class ConnectorModule<T, U> exten
T specDD,
U vendorDD,
String originalSpecDD,
- AnnotatedApp annotatedApp,
Map<JndiKey, Map<String, Object>> jndiContext,
Module parentModule) {
super(standAlone, moduleName, name, environment, moduleFile,
- targetPath, specDD, vendorDD, originalSpecDD, null, annotatedApp, jndiContext, parentModule);
+ targetPath, specDD, vendorDD, originalSpecDD, null, jndiContext, parentModule);
}
public ConfigurationModuleType getType() {
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=957655&r1=957654&r2=957655&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java Thu Jun 24 18:06:24 2010
@@ -18,6 +18,7 @@ package org.apache.geronimo.j2ee.deploym
import java.io.File;
import java.io.IOException;
+import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL;
@@ -39,7 +40,9 @@ import java.util.jar.JarFile;
import java.util.jar.Manifest;
import java.util.zip.ZipEntry;
+import javax.xml.bind.JAXBException;
import javax.xml.namespace.QName;
+import javax.xml.parsers.ParserConfigurationException;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.ClassPathList;
import org.apache.geronimo.deployment.ConfigurationBuilder;
@@ -64,8 +67,6 @@ import org.apache.geronimo.gbean.annotat
import org.apache.geronimo.gbean.annotation.ParamReference;
import org.apache.geronimo.gbean.annotation.ParamSpecial;
import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
-import org.apache.geronimo.j2ee.deployment.annotation.AnnotatedApp;
-import org.apache.geronimo.j2ee.deployment.annotation.AnnotatedEAR;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.j2ee.jndi.ApplicationJndi;
import org.apache.geronimo.j2ee.jndi.JndiScope;
@@ -96,10 +97,10 @@ import org.apache.geronimo.xbeans.geroni
import org.apache.geronimo.xbeans.geronimo.j2ee.GerApplicationType;
import org.apache.geronimo.xbeans.geronimo.j2ee.GerExtModuleType;
import org.apache.geronimo.xbeans.geronimo.j2ee.GerModuleType;
-import org.apache.geronimo.xbeans.javaee6.ApplicationDocument;
-import org.apache.geronimo.xbeans.javaee6.ApplicationType;
-import org.apache.geronimo.xbeans.javaee6.ModuleType;
-import org.apache.geronimo.xbeans.javaee6.WebType;
+import org.apache.openejb.jee.Application;
+//import org.apache.openejb.jee.Module;
+import org.apache.openejb.jee.JaxbJavaee;
+import org.apache.openejb.jee.Web;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
@@ -107,6 +108,7 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.xml.sax.SAXException;
/**
* @version $Rev$ $Date$
@@ -354,31 +356,41 @@ public class EARConfigBuilder implements
jarFile,
null,
null,
- null,
- null);
+ null
+ );
applicationInfo.getModules().add(module);
return applicationInfo;
}
private ApplicationInfo getEarPlan(File planFile, JarFile earFile, ModuleIDBuilder idBuilder) throws DeploymentException {
String specDD;
- ApplicationType application = null;
+ Application application = null;
if (earFile != null) {
try {
URL applicationXmlUrl = JarUtils.createJarURL(earFile, "META-INF/application.xml");
specDD = JarUtils.readAll(applicationXmlUrl);
//we found something called application.xml in the right place, if we can't parse it it's an error
- XmlObject xmlObject = XmlBeansUtil.parse(specDD);
- application = convertToApplicationSchema(xmlObject).getApplication();
- } catch (XmlException e) {
+ InputStream in = applicationXmlUrl.openStream();
+ try {
+ application = (Application) JaxbJavaee.unmarshal(Application.class, in);
+ } finally {
+ in.close();
+ }
+
+ } catch (ParserConfigurationException e) {
+ throw new DeploymentException("Could not parse application.xml", e);
+ } catch (SAXException e) {
+ throw new DeploymentException("Could not parse application.xml", e);
+ } catch (JAXBException e) {
throw new DeploymentException("Could not parse application.xml", e);
} catch (Exception e) {
- //ee5 spec allows optional application.xml, continue with application == null
+// ee5 spec allows optional application.xml, continue with application == null
if (!earFile.getName().endsWith(".ear")) {
return null;
}
- application = ApplicationType.Factory.newInstance();
+ application = new Application();
}
+
}
GerApplicationType gerApplication = null;
@@ -424,14 +436,13 @@ public class EARConfigBuilder implements
// todo change module so you can extract the real module path back out.. then we can eliminate
// the moduleLocations and have addModules return the modules
String applicationName = null;
- if (application.isSetApplicationName()) {
- applicationName = application.getApplicationName().getStringValue().trim();
+ if (application.getApplicationName() != null) {
+ applicationName = application.getApplicationName().trim();
} else if (earFile != null) {
applicationName = FileUtils.removeExtension(new File(earFile.getName()).getName(), ".ear");
} else {
applicationName = artifact.toString();
}
- AnnotatedApp annotatedApp = new AnnotatedEAR(application);
ApplicationInfo applicationInfo = new ApplicationInfo(ConfigurationModuleType.EAR,
environment,
earName,
@@ -439,8 +450,8 @@ public class EARConfigBuilder implements
earFile,
application,
gerApplication,
- application.toString(),
- annotatedApp);
+ application.toString()
+ );
try {
addModules(earFile, application, gerApplication, environment, applicationInfo, idBuilder);
if (applicationInfo.getModules().isEmpty()) {
@@ -467,26 +478,28 @@ public class EARConfigBuilder implements
return applicationInfo;
}
- private void addModulesToDefaultPlan(ApplicationType application, Set<Module<?, ?>> modules) {
+ private void addModulesToDefaultPlan(Application application, Set<Module<?, ?>> modules) {
for (Module module : modules) {
ConfigurationModuleType configurationModuleType = module.getType();
- ModuleType moduleType = application.addNewModule();
+ org.apache.openejb.jee.Module newModule = new org.apache.openejb.jee.Module();
if (configurationModuleType.equals(ConfigurationModuleType.WAR)) {
WebModule webModule = (WebModule) module;
- WebType web = moduleType.addNewWeb();
- web.addNewContextRoot().setStringValue(webModule.getContextRoot());
- web.addNewWebUri().setStringValue(webModule.getTargetPath());
+ Web web = new Web();
+ web.setContextRoot(webModule.getContextRoot());
+ web.setWebUri(webModule.getTargetPath());
+ newModule.setWeb(web);
} else if (configurationModuleType.equals(ConfigurationModuleType.EJB)) {
- moduleType.addNewEjb().setStringValue(module.getTargetPath());
+ newModule.setEjb(module.getTargetPath());
} else if (configurationModuleType.equals(ConfigurationModuleType.RAR)) {
- moduleType.addNewConnector().setStringValue(module.getTargetPath());
+ newModule.setConnector(module.getTargetPath());
} else if (configurationModuleType.equals(ConfigurationModuleType.CAR)) {
- moduleType.addNewJava().setStringValue(module.getTargetPath());
+ newModule.setJava(module.getTargetPath());
}
+ application.getModule().add(newModule);
}
}
- private GerApplicationType createDefaultPlan(ApplicationType application, JarFile module) {
+ private GerApplicationType createDefaultPlan(Application application, JarFile module) {
// construct the empty geronimo-application.xml
GerApplicationType gerApplication = GerApplicationType.Factory.newInstance();
EnvironmentType environmentType = gerApplication.addNewEnvironment();
@@ -513,41 +526,6 @@ public class EARConfigBuilder implements
return gerApplication;
}
- static ApplicationDocument convertToApplicationSchema(XmlObject xmlObject) throws XmlException {
- XmlCursor cursor = xmlObject.newCursor();
- XmlCursor moveable = xmlObject.newCursor();
- String schemaLocationURL = "http://java.sun.com/xml/ns/javaee/application_6.xsd";
- String version = "6";
- try {
- cursor.toStartDoc();
- cursor.toFirstChild();
- String nameSpaceURI = cursor.getName().getNamespaceURI();
- if ("http://java.sun.com/xml/ns/javaee".equals(nameSpaceURI) || "http://java.sun.com/xml/ns/j2ee".equals(nameSpaceURI)) {
- SchemaConversionUtils.convertSchemaVersion(cursor, SchemaConversionUtils.JAVAEE_NAMESPACE, schemaLocationURL, version);
- XmlObject result = xmlObject.changeType(ApplicationDocument.type);
- XmlBeansUtil.validateDD(result);
- return (ApplicationDocument) result;
- }
-
- // otherwise assume DTD
- SchemaConversionUtils.convertToSchema(cursor, SchemaConversionUtils.JAVAEE_NAMESPACE, schemaLocationURL, version);
- cursor.toStartDoc();
- cursor.toChild(SchemaConversionUtils.JAVAEE_NAMESPACE, "application");
- cursor.toFirstChild();
- SchemaConversionUtils.convertToDescriptionGroup(SchemaConversionUtils.JAVAEE_NAMESPACE, cursor, moveable);
- } finally {
- cursor.dispose();
- moveable.dispose();
- }
- XmlObject result = xmlObject.changeType(ApplicationDocument.type);
- if (result != null) {
- XmlBeansUtil.validateDD(result);
- return (ApplicationDocument) result;
- }
- XmlBeansUtil.validateDD(xmlObject);
- return (ApplicationDocument) xmlObject;
- }
-
public Artifact getConfigurationID(Object plan, JarFile module, ModuleIDBuilder idBuilder) throws IOException, DeploymentException {
ApplicationInfo applicationInfo = (ApplicationInfo) plan;
Artifact test = applicationInfo.getEnvironment().getConfigId();
@@ -600,7 +578,7 @@ public class EARConfigBuilder implements
ModuleList moduleLocations = applicationInfo.getModuleLocations();
if (ConfigurationModuleType.EAR == applicationType && earFile != null) {
//get the value of the library-directory element in spec DD
- ApplicationType specDD = (ApplicationType) applicationInfo.getSpecDD();
+ Application specDD = (Application) applicationInfo.getSpecDD();
String libDir = getLibraryDirectory(specDD);
ClassPathList libClasspath = new ClassPathList();
for (Enumeration<JarEntry> e = earFile.entries(); e.hasMoreElements();) {
@@ -758,14 +736,14 @@ public class EARConfigBuilder implements
}
}
- private String getLibraryDirectory(ApplicationType specDD) {
- if (specDD == null || !specDD.isSetLibraryDirectory()) {
+ private String getLibraryDirectory(Application specDD) {
+ if (specDD == null || specDD.getLibraryDirectory() == null) {
//value 'lib' is used if element not set or ear does not contain a dd
return "lib";
}
//only set if not empty value, empty value implies no library directory
- String value = specDD.getLibraryDirectory().getStringValue();
+ String value = specDD.getLibraryDirectory();
return value.trim().length() > 0 ? value : null;
}
@@ -821,45 +799,45 @@ public class EARConfigBuilder implements
return filter;
}
- private void addModules(JarFile earFile, ApplicationType application, GerApplicationType gerApplication, Environment environment, Module applicationInfo, ModuleIDBuilder idBuilder) throws DeploymentException {
+ private void addModules(JarFile earFile, Application application, GerApplicationType gerApplication, Environment environment, Module applicationInfo, ModuleIDBuilder idBuilder) throws DeploymentException {
Map<String, Object> altVendorDDs = new HashMap<String, Object>();
try {
mapVendorPlans(gerApplication, altVendorDDs, earFile);
if (earFile != null) {
- if (application.getModuleArray().length != 0) {
- ModuleType[] moduleTypes = application.getModuleArray();
+ if (application.getModule().size() != 0) {
+ List<org.apache.openejb.jee.Module> Modules = application.getModule();
//get a set containing all of the files in the ear that are actually modules
- for (ModuleType moduleXml : moduleTypes) {
+ for (org.apache.openejb.jee.Module moduleXml : Modules) {
String modulePath;
ModuleBuilder builder;
Object moduleContextInfo = null;
String moduleTypeName;
- if (moduleXml.isSetEjb()) {
- modulePath = moduleXml.getEjb().getStringValue();
+ if (moduleXml.getEjb() != null) {
+ modulePath = moduleXml.getEjb();
builder = getEjbConfigBuilder();
if (builder == null) {
throw new DeploymentException("Cannot deploy ejb application; No ejb deployer defined: " + modulePath);
}
moduleTypeName = "an EJB";
- } else if (moduleXml.isSetWeb()) {
- modulePath = moduleXml.getWeb().getWebUri().getStringValue();
+ } else if (moduleXml.getWeb() != null) {
+ modulePath = moduleXml.getWeb().getWebUri();
if (getWebConfigBuilder() == null) {
throw new DeploymentException("Cannot deploy web application; No war deployer defined: " + modulePath);
}
builder = getWebConfigBuilder();
moduleTypeName = "a war";
- moduleContextInfo = moduleXml.getWeb().getContextRoot().getStringValue().trim();
- } else if (moduleXml.isSetConnector()) {
- modulePath = moduleXml.getConnector().getStringValue();
+ moduleContextInfo = moduleXml.getWeb().getContextRoot().trim();
+ } else if (moduleXml.getConnector() != null) {
+ modulePath = moduleXml.getConnector();
if (getConnectorConfigBuilder() == null) {
throw new DeploymentException("Cannot deploy resource adapter; No rar deployer defined: " + modulePath);
}
builder = getConnectorConfigBuilder();
moduleTypeName = "a connector";
- } else if (moduleXml.isSetJava()) {
- modulePath = moduleXml.getJava().getStringValue();
+ } else if (moduleXml.getJava() != null) {
+ modulePath = moduleXml.getJava();
if (getAppClientConfigBuilder() == null) {
throw new DeploymentException("Cannot deploy app client; No app client deployer defined: " + modulePath);
}
@@ -1113,7 +1091,7 @@ public class EARConfigBuilder implements
return s.trim();
}
- private boolean isLibraryEntry(ApplicationType application, ZipEntry entry) {
+ private boolean isLibraryEntry(Application application, ZipEntry entry) {
String libDir = getLibraryDirectory(application);
return libDir != null && entry.getName().startsWith(libDir);
}
@@ -1153,12 +1131,12 @@ public class EARConfigBuilder implements
}
}
- private URL getAltSpecDDURL(JarFile earFile, ModuleType moduleXml) throws DeploymentException {
- if (moduleXml != null && moduleXml.isSetAltDd()) {
+ private URL getAltSpecDDURL(JarFile earFile, org.apache.openejb.jee.Module moduleXml) throws DeploymentException {
+ if (moduleXml != null && moduleXml.getAltDd() != null) {
try {
- return JarUtils.createJarURL(earFile, moduleXml.getAltDd().getStringValue());
+ return JarUtils.createJarURL(earFile, moduleXml.getAltDd());
} catch (MalformedURLException e) {
- throw new DeploymentException("Invalid alt sped dd url: " + moduleXml.getAltDd().getStringValue(), e);
+ throw new DeploymentException("Invalid alt sped dd url: " + moduleXml.getAltDd(), e);
}
}
return null;
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EJBModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EJBModule.java?rev=957655&r1=957654&r2=957655&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EJBModule.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EJBModule.java Thu Jun 24 18:06:24 2010
@@ -20,17 +20,16 @@ import java.util.Map;
import java.util.jar.JarFile;
import org.apache.geronimo.gbean.AbstractName;
-import org.apache.geronimo.j2ee.deployment.annotation.AnnotatedApp;
import org.apache.geronimo.j2ee.jndi.JndiKey;
import org.apache.geronimo.kernel.config.ConfigurationModuleType;
import org.apache.geronimo.kernel.repository.Environment;
+import org.apache.openejb.jee.EjbJar;
import org.apache.xmlbeans.XmlObject;
/**
* @version $Rev$ $Date$
*/
-public class EJBModule extends Module<XmlObject, XmlObject> {
- private AbstractName moduleCmpEngineName;
+public class EJBModule<U> extends Module<EjbJar, U> {
public EJBModule(boolean standAlone,
AbstractName moduleName,
@@ -38,27 +37,18 @@ public class EJBModule extends Module<Xm
Environment environment,
JarFile moduleFile,
String targetPath,
- XmlObject specDD,
- XmlObject vendorDD,
+ EjbJar specDD,
+ U vendorDD,
String originalSpecDD,
- AnnotatedApp annotatedApp,
Map<JndiKey, Map<String, Object>> jndiContext,
Module parentModule) {
super(standAlone, moduleName, name, environment, moduleFile,
- targetPath, specDD, vendorDD, originalSpecDD, null, annotatedApp, jndiContext, parentModule);
+ targetPath, specDD, vendorDD, originalSpecDD, null, jndiContext, parentModule);
}
public ConfigurationModuleType getType() {
return ConfigurationModuleType.EJB;
}
- public AbstractName getModuleCmpEngineName() {
- return moduleCmpEngineName;
- }
-
- public void setModuleCmpEngineName(AbstractName moduleCmpEngineName) {
- this.moduleCmpEngineName = moduleCmpEngineName;
- }
-
}
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/Module.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/Module.java?rev=957655&r1=957654&r2=957655&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/Module.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/Module.java Thu Jun 24 18:06:24 2010
@@ -28,7 +28,6 @@ import org.apache.geronimo.deployment.De
import org.apache.geronimo.deployment.DeployableJarFile;
import org.apache.geronimo.deployment.ModuleList;
import org.apache.geronimo.gbean.AbstractName;
-import org.apache.geronimo.j2ee.deployment.annotation.AnnotatedApp;
import org.apache.geronimo.j2ee.jndi.JndiKey;
import org.apache.geronimo.j2ee.jndi.JndiScope;
import org.apache.geronimo.kernel.config.ConfigurationData;
@@ -36,7 +35,6 @@ import org.apache.geronimo.kernel.config
import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.kernel.repository.Environment;
import org.apache.xbean.finder.AbstractFinder;
-import org.apache.xbean.finder.ClassFinder;
/**
* @version $Rev$ $Date$
@@ -58,7 +56,6 @@ public abstract class Module<T, U> {
private EARContext rootEarContext;
private T specDD;
private String originalSpecDD;
- private AnnotatedApp annotatedApp;
private AbstractFinder classFinder;
protected final Map sharedContext = new HashMap();
@@ -78,11 +75,10 @@ public abstract class Module<T, U> {
U vendorDD,
String originalSpecDD,
String namespace,
- AnnotatedApp annotatedApp,
Map<JndiKey, Map<String, Object>> jndiContext,
Module<?, ?> parentModule) {
this(standAlone, moduleName, name, environment, new DeployableJarFile(moduleFile),
- targetPath, specDD, vendorDD, originalSpecDD, namespace, annotatedApp, jndiContext, parentModule);
+ targetPath, specDD, vendorDD, originalSpecDD, namespace, jndiContext, parentModule);
}
protected Module(boolean standAlone,
@@ -95,7 +91,6 @@ public abstract class Module<T, U> {
U vendorDD,
String originalSpecDD,
String namespace,
- AnnotatedApp annotatedApp,
Map<JndiKey, Map<String, Object>> jndiContext, Module<?, ?> parentModule) {
assert targetPath != null : "targetPath is null";
assert moduleName != null : "moduleName is null";
@@ -119,7 +114,6 @@ public abstract class Module<T, U> {
}
targetPathURI = URI.create(targetPath + "/");
- this.annotatedApp = annotatedApp;
this.moduleLocations = new ModuleList();
this.modules = new LinkedHashSet<Module<?, ?>>();
if (jndiContext != null) {
@@ -243,14 +237,6 @@ public abstract class Module<T, U> {
this.originalSpecDD = originalSpecDD;
}
- public AnnotatedApp getAnnotatedApp() {
- return annotatedApp;
- }
-
- public void setAnnotatedApp(AnnotatedApp annotatedApp) {
- this.annotatedApp = annotatedApp;
- }
-
public AbstractFinder getClassFinder() {
return classFinder;
}
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilder.java?rev=957655&r1=957654&r2=957655&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilder.java Thu Jun 24 18:06:24 2010
@@ -26,6 +26,7 @@ import org.apache.geronimo.gbean.Abstrac
import org.apache.geronimo.j2ee.annotation.Holder;
import org.apache.geronimo.j2ee.jndi.JndiKey;
import org.apache.geronimo.kernel.repository.Environment;
+import org.apache.openejb.jee.JndiConsumer;
import org.apache.xmlbeans.XmlObject;
/**
@@ -55,11 +56,11 @@ public interface NamingBuilder extends A
}
};
- void buildEnvironment(XmlObject specDD, XmlObject plan, Environment environment) throws DeploymentException;
+ void buildEnvironment(JndiConsumer specDD, XmlObject plan, Environment environment) throws DeploymentException;
- void initContext(XmlObject specDD, XmlObject plan, Module module) throws DeploymentException;
+ void initContext(JndiConsumer specDD, XmlObject plan, Module module) throws DeploymentException;
- void buildNaming(XmlObject specDD, XmlObject plan, Module module, Map<EARContext.Key, Object> sharedContext) throws DeploymentException;
+ void buildNaming(JndiConsumer specDD, XmlObject plan, Module module, Map<EARContext.Key, Object> sharedContext) throws DeploymentException;
/**
* Returns sort order priority. Lower numbers indicate higher priority.
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollection.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollection.java?rev=957655&r1=957654&r2=957655&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollection.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollection.java Thu Jun 24 18:06:24 2010
@@ -32,6 +32,7 @@ import org.apache.geronimo.kernel.reposi
import org.apache.geronimo.gbean.annotation.GBean;
import org.apache.geronimo.gbean.annotation.ParamReference;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.openejb.jee.JndiConsumer;
import org.apache.xmlbeans.XmlObject;
/**
@@ -44,19 +45,19 @@ public class NamingBuilderCollection ext
super(builders);
}
- public void buildEnvironment(XmlObject specDD, XmlObject plan, Environment environment) throws DeploymentException {
+ public void buildEnvironment(JndiConsumer specDD, XmlObject plan, Environment environment) throws DeploymentException {
for (NamingBuilder namingBuilder : getSortedBuilders()) {
namingBuilder.buildEnvironment(specDD, plan, environment);
}
}
- public void initContext(XmlObject specDD, XmlObject plan, Module module) throws DeploymentException {
+ public void initContext(JndiConsumer specDD, XmlObject plan, Module module) throws DeploymentException {
for (NamingBuilder namingBuilder : getSortedBuilders()) {
namingBuilder.initContext(specDD, plan, module);
}
}
- public void buildNaming(XmlObject specDD, XmlObject plan, Module module, Map<EARContext.Key, Object> sharedContext) throws DeploymentException {
+ public void buildNaming(JndiConsumer specDD, XmlObject plan, Module module, Map<EARContext.Key, Object> sharedContext) throws DeploymentException {
for (NamingBuilder namingBuilder : getSortedBuilders()) {
if (EARConfigBuilder.createPlanMode.get().booleanValue()) {
try {
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebModule.java?rev=957655&r1=957654&r2=957655&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebModule.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebModule.java Thu Jun 24 18:06:24 2010
@@ -22,16 +22,16 @@ import java.util.jar.JarFile;
import org.apache.geronimo.deployment.Deployable;
import org.apache.geronimo.deployment.DeployableJarFile;
import org.apache.geronimo.gbean.AbstractName;
-import org.apache.geronimo.j2ee.deployment.annotation.AnnotatedWebApp;
import org.apache.geronimo.j2ee.jndi.JndiKey;
import org.apache.geronimo.kernel.config.ConfigurationModuleType;
import org.apache.geronimo.kernel.repository.Environment;
+import org.apache.openejb.jee.WebApp;
import org.apache.xmlbeans.XmlObject;
/**
* @version $Rev$ $Date$
*/
-public class WebModule extends Module<XmlObject, XmlObject> {
+public class WebModule extends Module<WebApp, XmlObject> {
private final String contextRoot;
public static final String WEB_APP_DATA = "WEB_APP_DATA";
@@ -41,16 +41,15 @@ public class WebModule extends Module<Xm
Environment environment,
JarFile moduleFile,
String targetPath,
- XmlObject specDD,
+ WebApp specDD,
XmlObject vendorDD,
String originalSpecDD,
String contextRoot,
String namespace,
- AnnotatedWebApp annotatedWebApp,
Map<JndiKey, Map<String, Object>> jndiContext,
Module parentModule) {
- this(standAlone, moduleName, name, environment, new DeployableJarFile(moduleFile),
- targetPath, specDD, vendorDD, originalSpecDD, contextRoot, namespace, annotatedWebApp, jndiContext, parentModule);
+ this(standAlone, moduleName, name, environment, new DeployableJarFile(moduleFile),
+ targetPath, specDD, vendorDD, originalSpecDD, contextRoot, namespace, jndiContext, parentModule);
}
public WebModule(boolean standAlone,
@@ -59,16 +58,15 @@ public class WebModule extends Module<Xm
Environment environment,
Deployable deployable,
String targetPath,
- XmlObject specDD,
+ WebApp specDD,
XmlObject vendorDD,
String originalSpecDD,
String contextRoot,
String namespace,
- AnnotatedWebApp annotatedWebApp,
Map<JndiKey, Map<String, Object>> jndiContext
, Module parentModule) {
super(standAlone, moduleName, name, environment, deployable,
- targetPath, specDD, vendorDD, originalSpecDD, namespace, annotatedWebApp, jndiContext, parentModule);
+ targetPath, specDD, vendorDD, originalSpecDD, namespace, jndiContext, parentModule);
this.contextRoot = contextRoot;
}
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelper.java?rev=957655&r1=957654&r2=957655&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelper.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelper.java Thu Jun 24 18:06:24 2010
@@ -22,13 +22,9 @@ package org.apache.geronimo.j2ee.deploym
import java.lang.reflect.Field;
import java.lang.reflect.Method;
+import java.util.List;
-import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
-import org.apache.geronimo.xbeans.javaee6.FullyQualifiedClassType;
-import org.apache.geronimo.xbeans.javaee6.InjectionTargetType;
-import org.apache.geronimo.xbeans.javaee6.JavaIdentifierType;
-import org.apache.xmlbeans.XmlException;
+import org.apache.openejb.jee.InjectionTarget;
/**
* @version $Rev$ $Date$
@@ -72,12 +68,12 @@ public class AnnotationHelper {
}
}
- protected static boolean hasTarget(Method method, Field field, InjectionTargetType[] targets) {
+ protected static boolean hasTarget(Method method, Field field, List<InjectionTarget> targets) {
String injectionJavaType = getInjectionJavaType(method, field);
String injectionClass = getInjectionClass(method, field);
- for (InjectionTargetType target : targets) {
- if (injectionClass.equals(target.getInjectionTargetClass().getStringValue().trim())
- && injectionJavaType.equals(target.getInjectionTargetName().getStringValue().trim())) {
+ for (InjectionTarget target : targets) {
+ if (injectionClass.equals(target.getInjectionTargetClass().trim())
+ && injectionJavaType.equals(target.getInjectionTargetName().trim())) {
return true;
}
}
@@ -87,19 +83,17 @@ public class AnnotationHelper {
/**
* Configure Injection Target
*
- * @param injectionTarget
* @param method
* @param field
*/
- protected static void configureInjectionTarget(InjectionTargetType injectionTarget, Method method, Field field) {
-
+ protected static InjectionTarget configureInjectionTarget(Method method, Field field) {
+ InjectionTarget injectionTarget = new InjectionTarget();
String injectionJavaType = getInjectionJavaType(method, field);
String injectionClass = getInjectionClass(method, field);
- FullyQualifiedClassType qualifiedClass = injectionTarget.addNewInjectionTargetClass();
- JavaIdentifierType javaType = injectionTarget.addNewInjectionTargetName();
- qualifiedClass.setStringValue(injectionClass);
- javaType.setStringValue(injectionJavaType);
+ injectionTarget.setInjectionTargetClass(injectionClass);
+ injectionTarget.setInjectionTargetName(injectionJavaType);
+ return injectionTarget;
}
/**
@@ -109,11 +103,11 @@ public class AnnotationHelper {
* @throws org.apache.geronimo.common.DeploymentException
* thrown if deployment descriptor cannot be parsed
*/
- protected static void validateDD(AnnotatedApp annotatedApp) throws DeploymentException {
- try {
- XmlBeansUtil.parse(annotatedApp.toString());
- } catch (XmlException e) {
- throw new DeploymentException("Result of processing web service refs invalid.", e);
- }
- }
+// protected static void validateDD(AnnotatedApp annotatedApp) throws DeploymentException {
+// try {
+// XmlBeansUtil.parse(annotatedApp.toString());
+// } catch (XmlException e) {
+// throw new DeploymentException("Result of processing web service refs invalid.", e);
+// }
+// }
}