You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2010/05/25 05:26:54 UTC
svn commit: r947901 [2/3] - in /geronimo/server/trunk:
framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/
framework/configs/jsr88-cli/src/main/history/
framework/configs/jsr88-deploymentfactory/src/main/history/
framework/configs/onl...
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/pojo/POJOWebServiceContainerFactoryGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/pojo/POJOWebServiceContainerFactoryGBean.java?rev=947901&r1=947900&r2=947901&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/pojo/POJOWebServiceContainerFactoryGBean.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/pojo/POJOWebServiceContainerFactoryGBean.java Tue May 25 03:26:52 2010
@@ -17,17 +17,17 @@
package org.apache.geronimo.axis2.pojo;
-import java.net.URL;
import java.util.Map;
import javax.naming.Context;
import javax.naming.NamingException;
import javax.transaction.TransactionManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-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.gbean.annotation.ParamReference;
+import org.apache.geronimo.gbean.annotation.ParamSpecial;
+import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.jaxws.annotations.AnnotationHolder;
import org.apache.geronimo.kernel.Kernel;
@@ -36,60 +36,61 @@ import org.apache.geronimo.naming.refere
import org.apache.geronimo.transaction.GeronimoUserTransaction;
import org.apache.geronimo.webservices.WebServiceContainer;
import org.apache.geronimo.webservices.WebServiceContainerFactory;
+import org.osgi.framework.Bundle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Rev$ $Date$
*/
+@GBean
public class POJOWebServiceContainerFactoryGBean implements WebServiceContainerFactory
{
private static final Logger LOG = LoggerFactory.getLogger(POJOWebServiceContainerFactoryGBean.class);
-
+
private final ClassLoader classLoader;
private final org.apache.geronimo.jaxws.PortInfo portInfo;
private final String endpointClassName;
- private URL configurationBaseUrl;
private Context context;
private AnnotationHolder holder;
private String contextRoot;
+ private Bundle bundle;
+
+ public POJOWebServiceContainerFactoryGBean(
+ @ParamAttribute(name="portInfo") org.apache.geronimo.jaxws.PortInfo portInfo,
+ @ParamAttribute(name="endpointClassName") String endpointClassName,
+ @ParamAttribute(name="componentContext") Map componentContext,
+ @ParamReference(name="TransactionManager", namingType=NameFactory.JTA_RESOURCE) TransactionManager transactionManager,
+ @ParamAttribute(name="holder") AnnotationHolder holder,
+ @ParamAttribute(name="contextRoot") String contextRoot,
+ @ParamSpecial(type = SpecialAttributeType.kernel) Kernel kernel,
+ @ParamSpecial(type = SpecialAttributeType.bundle) Bundle bundle,
+ @ParamSpecial(type = SpecialAttributeType.classLoader) ClassLoader classLoader)
+ throws InstantiationException, IllegalAccessException, ClassNotFoundException {
- public POJOWebServiceContainerFactoryGBean(org.apache.geronimo.jaxws.PortInfo portInfo,
- String endpointClassName,
- ClassLoader classLoader,
- Map componentContext,
- Kernel kernel,
- TransactionManager transactionManager,
- URL configurationBaseUrl,
- AnnotationHolder holder,
- String contextRoot)
- throws InstantiationException, IllegalAccessException, ClassNotFoundException {
-
if (componentContext != null) {
-
+
// The name should match WebServiceContextAnnotationHelper.RELATIVE_JNDI_NAME
- componentContext.put("env/WebServiceContext", new WebServiceContextReference());
-
+ componentContext.put("comp/env/WebServiceContext", new WebServiceContextReference());
+
GeronimoUserTransaction userTransaction = new GeronimoUserTransaction(transactionManager);
try {
- this.context = EnterpriseNamingContext.livenReferences(componentContext,
- userTransaction,
- kernel,
- classLoader,"comp/");
+ this.context = EnterpriseNamingContext.livenReferences(componentContext, userTransaction, kernel, classLoader, bundle, "comp/");
} catch (NamingException e) {
LOG.warn("Failed to create naming context", e);
}
}
-
+
this.portInfo = portInfo;
this.classLoader = classLoader;
+ this.bundle = bundle;
this.endpointClassName = endpointClassName;
- this.configurationBaseUrl = configurationBaseUrl;
this.holder = holder;
this.contextRoot = contextRoot;
}
public WebServiceContainer getWebServiceContainer() {
- POJOWebServiceContainer container = new POJOWebServiceContainer(portInfo, endpointClassName, classLoader,
- context, configurationBaseUrl, holder, contextRoot);
+ POJOWebServiceContainer container = new POJOWebServiceContainer(portInfo, endpointClassName, bundle, context, holder, contextRoot);
try {
container.init();
} catch (Exception e) {
@@ -101,39 +102,6 @@ public class POJOWebServiceContainerFact
private static class WebServiceContextReference extends SimpleReference {
public Object getContent() throws NamingException {
return new POJOWebServiceContext();
- }
- }
-
- public static final GBeanInfo GBEAN_INFO;
-
- static {
- GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(POJOWebServiceContainerFactoryGBean.class, GBeanInfoBuilder.DEFAULT_J2EE_TYPE);
- infoBuilder.addAttribute("portInfo", org.apache.geronimo.jaxws.PortInfo.class, true, true);
- infoBuilder.addAttribute("endpointClassName", String.class, true, true);
- infoBuilder.addAttribute("classLoader", ClassLoader.class, false);
- infoBuilder.addAttribute("componentContext", Map.class, true, true);
- infoBuilder.addAttribute("kernel", Kernel.class, false);
- infoBuilder.addReference("TransactionManager", TransactionManager.class, NameFactory.JTA_RESOURCE);
- infoBuilder.addAttribute("configurationBaseUrl", URL.class, true);
- infoBuilder.addAttribute("holder", AnnotationHolder.class, true);
- infoBuilder.addAttribute("contextRoot", String.class, true, true);
-
- infoBuilder.setConstructor(new String[]{
- "portInfo",
- "endpointClassName",
- "classLoader",
- "componentContext",
- "kernel",
- "TransactionManager",
- "configurationBaseUrl",
- "holder",
- "contextRoot"
- });
-
- GBEAN_INFO = infoBuilder.getBeanInfo();
- }
-
- public static GBeanInfo getGBeanInfo() {
- return GBEAN_INFO;
+ }
}
}
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/Axis2WebServiceContainerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/Axis2WebServiceContainerTest.java?rev=947901&r1=947900&r2=947901&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/Axis2WebServiceContainerTest.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/Axis2WebServiceContainerTest.java Tue May 25 03:26:52 2010
@@ -29,6 +29,7 @@ import javax.xml.parsers.DocumentBuilder
import org.apache.geronimo.axis2.pojo.POJOWebServiceContainer;
import org.apache.geronimo.jaxws.PortInfo;
import org.apache.geronimo.jaxws.annotations.AnnotationHolder;
+import org.apache.geronimo.kernel.osgi.MockBundle;
import org.apache.geronimo.kernel.util.XmlUtil;
import org.apache.geronimo.webservices.WebServiceContainer.Request;
import org.w3c.dom.Document;
@@ -48,12 +49,12 @@ public class Axis2WebServiceContainerTes
"test_service_doclitbare.wsdl", "test_service_doclitbare_request.xml");
}
*/
-
+
public void testRPCInvokeWithWSDL() throws Exception {
invokeWithWSDL("RPCLitService", "org.apache.geronimo.axis2.testdata.rpclit.RPCLitService",
"test_service_rpclit.wsdl", "test_service_rpclit_request.xml");
}
-
+
public void testGetWSDL() throws Exception {
ClassLoader cl = Thread.currentThread().getContextClassLoader();
@@ -71,9 +72,9 @@ public class Axis2WebServiceContainerTes
"127.0.0.1");
ByteArrayOutputStream out = new ByteArrayOutputStream();
Axis2Response res = new Axis2Response("text/xml; charset=utf-8", "127.0.0.1", null, null, 8080, out);
-
+
String endpointClassName = "org.apache.geronimo.axis2.testdata.simple.HelloWorld";
- POJOWebServiceContainer container = new POJOWebServiceContainer(portInfo, endpointClassName, cl, null, null, AnnotationHolder.EMPTY, "/axis2");
+ POJOWebServiceContainer container = new POJOWebServiceContainer(portInfo, endpointClassName, new MockBundle(cl, null,11L), null, AnnotationHolder.EMPTY, "/axis2");
container.init();
container.invoke(req, res);
out.flush();
@@ -83,16 +84,16 @@ public class Axis2WebServiceContainerTes
private void invokeWithWSDL(String serviceName, String endPointClassName, String wsdl, String requestFile ) throws Exception {
ClassLoader cl = Thread.currentThread().getContextClassLoader();
InputStream in = cl.getResourceAsStream(requestFile);
-
+
//This will reduce number of requests files
DocumentBuilder documentBuilder = XmlUtil.newDocumentBuilderFactory().newDocumentBuilder();
Document doc = documentBuilder.parse(in);
Element root = doc.getDocumentElement();
NodeList nodeList = root.getElementsByTagName("soap:Envelope");
-
+
InputStream request;
-
+
for(int i = 0; i < nodeList.getLength(); i++){
StringBuffer envelope = new StringBuffer("<soap:Envelope");
Element element = (Element)nodeList.item(i);
@@ -103,10 +104,10 @@ public class Axis2WebServiceContainerTes
envelope.append("=\""+attributes.item(k).getNodeValue().trim()+"\"");
}
String content = element.getTextContent();
-
+
if(content != null && !content.equals("")){
envelope.append(">");
-
+
NodeList children = element.getChildNodes();
if(children != null){
for(int j=0; j < children.getLength(); j++){
@@ -123,14 +124,14 @@ public class Axis2WebServiceContainerTes
envelope.append("/>");
}
}
-
+
System.out.println(envelope.toString());
-
+
request = new ByteArrayInputStream(envelope.toString().getBytes("UTF-8"));
-
+
PortInfo portInfo = new PortInfo();
portInfo.setLocation("/axis2/" + serviceName);
-
+
File wsdlFile = new File(RESOURCE_PATH + wsdl);
portInfo.setWsdlFile(wsdlFile.toURI().toURL().toString());
@@ -147,7 +148,7 @@ public class Axis2WebServiceContainerTes
ByteArrayOutputStream out = new ByteArrayOutputStream();
Axis2Response res = new Axis2Response("text/xml; charset=utf-8", "127.0.0.1", null, null, 8080, out);
- POJOWebServiceContainer container = new POJOWebServiceContainer(portInfo, endPointClassName, cl, null, null, AnnotationHolder.EMPTY, "/axis2");
+ POJOWebServiceContainer container = new POJOWebServiceContainer(portInfo, endPointClassName, new MockBundle(cl, null, 11L), null, AnnotationHolder.EMPTY, "/axis2");
container.init();
container.invoke(req, res);
System.out.println("Response "+out);
@@ -167,20 +168,20 @@ public class Axis2WebServiceContainerTes
}
}
}
-
+
private String getElementContent(Element e){
StringBuffer content = new StringBuffer("<"+e.getNodeName());
NamedNodeMap attributes = e.getAttributes();
-
+
if(attributes != null){
for(int k=0; k < attributes.getLength(); k++){
content.append(" "+attributes.item(k).getNodeName()) ;
content.append("=\""+attributes.item(k).getNodeValue()+"\"") ;
}
}
-
+
String value = e.getTextContent();
-
+
if(value != null && !value.equals("")){
content.append(">");
@@ -199,10 +200,10 @@ public class Axis2WebServiceContainerTes
}else {
content.append("/>");
}
-
+
return content.toString();
}
-
+
protected void setUp() throws Exception {
}
Modified: geronimo/server/trunk/plugins/bval/bval-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/bval/bval-deployer/src/main/history/dependencies.xml?rev=947901&r1=947900&r2=947901&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/bval/bval-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/bval/bval-deployer/src/main/history/dependencies.xml Tue May 25 03:26:52 2010
@@ -7,41 +7,6 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.bval</groupId>
- <artifactId>bval-core</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.bval</groupId>
- <artifactId>bval-jsr303</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.bval</groupId>
<artifactId>org.apache.bval.bundle</artifactId>
<type>jar</type>
@@ -66,9 +31,4 @@
<artifactId>geronimo-validation_1.0_spec</artifactId>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- <type>jar</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml?rev=947901&r1=947900&r2=947901&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml Tue May 25 03:26:52 2010
@@ -7,36 +7,6 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>asm</groupId>
- <artifactId>asm-all</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
<type>jar</type>
@@ -52,26 +22,11 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.bval</groupId>
- <artifactId>bval-core</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.bval</groupId>
- <artifactId>bval-jsr303</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.bundlerepository</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>sxc-jaxb</artifactId>
<type>jar</type>
@@ -103,11 +58,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-cli</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-core</artifactId>
<type>jar</type>
</dependency>
@@ -118,11 +68,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-main</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-management</artifactId>
<type>jar</type>
</dependency>
@@ -238,11 +183,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-osgi-registry</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-saaj_1.3_spec</artifactId>
<type>jar</type>
</dependency>
@@ -303,11 +243,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.howl</artifactId>
<type>jar</type>
</dependency>
@@ -317,16 +252,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xstream</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-asm-shaded</artifactId>
<type>jar</type>
@@ -356,9 +281,4 @@
<artifactId>tranql-connector</artifactId>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- <type>jar</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/client/geronimo-client/src/main/java/org/apache/geronimo/client/StaticJndiContextPlugin.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client/src/main/java/org/apache/geronimo/client/StaticJndiContextPlugin.java?rev=947901&r1=947900&r2=947901&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client/src/main/java/org/apache/geronimo/client/StaticJndiContextPlugin.java (original)
+++ geronimo/server/trunk/plugins/client/geronimo-client/src/main/java/org/apache/geronimo/client/StaticJndiContextPlugin.java Tue May 25 03:26:52 2010
@@ -30,6 +30,7 @@ import org.apache.geronimo.gbean.GBeanIn
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.kernel.Kernel;
+import org.osgi.framework.Bundle;
/**
* @version $Rev$ $Date$
@@ -37,13 +38,13 @@ import org.apache.geronimo.kernel.Kernel
public class StaticJndiContextPlugin implements AppClientPlugin {
private final Context context;
- public StaticJndiContextPlugin(Map<JndiKey, Map<String, Object>> contexts, Kernel kernel, ClassLoader classLoader) throws NamingException {
+ public StaticJndiContextPlugin(Map<JndiKey, Map<String, Object>> contexts, Kernel kernel, ClassLoader classLoader, Bundle bundle) throws NamingException {
//TODO this does not include global entries from other apps.
Map<String, Object> clientContext = new HashMap<String, Object>();
for (Map<String, Object> context: contexts.values()) {
clientContext.putAll(context);
}
- this.context = EnterpriseNamingContext.livenReferences(clientContext, null, kernel, classLoader, "comp/");
+ this.context = EnterpriseNamingContext.livenReferences(clientContext, null, kernel, classLoader, bundle, "comp/");
}
public void startClient(AbstractName appClientModuleName, Kernel kernel, ClassLoader classLoader) throws Exception {
@@ -68,9 +69,10 @@ public class StaticJndiContextPlugin imp
infoFactory.addAttribute("jndiContext", Context.class, false);
infoFactory.addAttribute("kernel", Kernel.class, false);
infoFactory.addAttribute("classLoader", ClassLoader.class, false);
+ infoFactory.addAttribute("bundle", Bundle.class, false);
infoFactory.addInterface(AppClientPlugin.class);
- infoFactory.setConstructor(new String[]{"context", "kernel", "classLoader"});
+ infoFactory.setConstructor(new String[]{"context", "kernel", "classLoader", "bundle"});
GBEAN_INFO = infoFactory.getBeanInfo();
}
Modified: geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/main/history/dependencies.xml?rev=947901&r1=947900&r2=947901&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/main/history/dependencies.xml Tue May 25 03:26:52 2010
@@ -23,16 +23,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-cli</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-main</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
<artifactId>j2ee-security</artifactId>
<type>car</type>
</dependency>
@@ -48,50 +38,15 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.1_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-osgi-registry</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-bundleutils</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-finder</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.tranql</groupId>
<artifactId>tranql-connector</artifactId>
<type>jar</type>
Modified: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/StandardServant.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/StandardServant.java?rev=947901&r1=947900&r2=947901&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/StandardServant.java (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/StandardServant.java Tue May 25 03:26:52 2010
@@ -21,7 +21,6 @@ import java.rmi.AccessException;
import java.rmi.MarshalException;
import java.rmi.NoSuchObjectException;
import java.rmi.RemoteException;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Vector;
import java.util.Map;
@@ -124,7 +123,7 @@ public class StandardServant extends Ser
componentContext.put("comp/ORB", orb);
componentContext.put("comp/HandleDelegate", new CORBAHandleDelegate());
try {
- enc = EnterpriseNamingContext.livenReferences(componentContext, null, null, null, "comp");
+ enc = EnterpriseNamingContext.livenReferences(componentContext, null, null, null, null, "comp");
} catch (NamingException e) {
throw new RuntimeException("Error creating standard servant naming context", e);
}
@@ -218,7 +217,7 @@ public class StandardServant extends Ser
}
} else {
try {
- Object handleKey = handle.getPrimaryKey();
+ Object handleKey = handle.getPrimaryKey();
RpcContainer container = (RpcContainer) ejbDeployment.getContainer();
result = container.invoke(ejbDeployment.getDeploymentId(), interfaceType, method.getDeclaringClass(), method, arguments, handleKey);
} catch (OpenEJBException e) {
@@ -249,10 +248,10 @@ public class StandardServant extends Ser
try {
RpcContainer container = (RpcContainer) ejbDeployment.getContainer();
result = container.invoke(ejbDeployment.getDeploymentId(), interfaceType, method.getDeclaringClass(), method, arguments, primaryKey);
- // some methods like create() or find* return ProxyInfo objects. We need to
- // turn those into real EJB remote references.
+ // some methods like create() or find* return ProxyInfo objects. We need to
+ // turn those into real EJB remote references.
if (result instanceof ProxyInfo || method.getName().startsWith("find")) {
- result = createProxy(result);
+ result = createProxy(result);
}
} catch (OpenEJBException e) {
Throwable cause = e.getCause();
@@ -320,11 +319,11 @@ public class StandardServant extends Ser
/**
* Convert ProxyInfo items in a create* or find* result
- * for returning as a corba result.
- *
+ * for returning as a corba result.
+ *
* @param retValue The return value.
- *
- * @return A CORBA compatible return result.
+ *
+ * @return A CORBA compatible return result.
* @exception Throwable
*/
protected Object createProxy(Object retValue) throws Throwable {
Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java?rev=947901&r1=947900&r2=947901&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java Tue May 25 03:26:52 2010
@@ -24,7 +24,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.util.jar.JarFile;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
@@ -32,8 +31,6 @@ import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
import javax.xml.transform.stream.StreamSource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.cxf.jaxws.javaee.HandlerChainsType;
import org.apache.cxf.jaxws.javaee.PortComponentType;
import org.apache.cxf.jaxws.javaee.ServiceImplBeanType;
@@ -56,20 +53,23 @@ import org.apache.geronimo.jaxws.builder
import org.apache.geronimo.jaxws.builder.wsdl.WsdlGenerator;
import org.apache.geronimo.jaxws.builder.wsdl.WsdlGeneratorOptions;
import org.apache.geronimo.kernel.repository.Environment;
+import org.osgi.framework.Bundle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class CXFBuilder extends JAXWSServiceBuilder {
private static final Logger LOG = LoggerFactory.getLogger(CXFBuilder.class);
-
+
/**
- * This property if enabled will cause the Sun wsgen tool to be used to
+ * This property if enabled will cause the Sun wsgen tool to be used to
* generate the WSDL for servies without WSDL. By default CXF tooling
* will be used the generate the WSDL.
*/
- private static final String USE_WSGEN_PROPERTY =
+ private static final String USE_WSGEN_PROPERTY =
"org.apache.geronimo.cxf.use.wsgen";
protected Collection<WsdlGenerator> wsdlGenerators;
-
+
public CXFBuilder() {
super(null);
}
@@ -183,7 +183,7 @@ public class CXFBuilder extends JAXWSSer
}
}
}
-
+
private static String getString(String in) {
if (in != null) {
in = in.trim();
@@ -193,15 +193,14 @@ public class CXFBuilder extends JAXWSSer
}
return in;
}
-
+
@Override
- protected void initialize(GBeanData targetGBean, Class serviceClass, PortInfo portInfo, Module module)
- throws DeploymentException {
+ protected void initialize(GBeanData targetGBean, Class serviceClass, PortInfo portInfo, Module module, Bundle bundle) throws DeploymentException {
if (Boolean.getBoolean(USE_WSGEN_PROPERTY)) {
- generateWSDL(serviceClass, portInfo, module);
+ generateWSDL(serviceClass, portInfo, module, bundle);
}
}
-
+
protected WsdlGenerator getWsdlGenerator() throws DeploymentException {
if (this.wsdlGenerators == null || this.wsdlGenerators.isEmpty()) {
throw new DeploymentException("Wsdl generator not found");
@@ -209,51 +208,51 @@ public class CXFBuilder extends JAXWSSer
return this.wsdlGenerators.iterator().next();
}
}
-
- private void generateWSDL(Class serviceClass, PortInfo portInfo, Module module)
+
+ private void generateWSDL(Class serviceClass, PortInfo portInfo, Module module, Bundle bundle)
throws DeploymentException {
String serviceName = (portInfo.getServiceName() == null ? serviceClass.getName() : portInfo.getServiceName());
- if (isWsdlSet(portInfo, serviceClass)) {
+ if (isWsdlSet(portInfo, serviceClass, bundle)) {
LOG.debug("Service " + serviceName + " has WSDL.");
return;
- }
-
+ }
+
if (isHTTPBinding(portInfo, serviceClass)) {
LOG.debug("Service " + serviceName + " has HTTPBinding.");
return;
}
-
- if (JAXWSUtils.isWebServiceProvider(serviceClass)) {
+
+ if (JAXWSUtils.isWebServiceProvider(serviceClass)) {
throw new DeploymentException("WSDL must be specified for @WebServiceProvider service " + serviceName);
}
-
+
LOG.debug("Service " + serviceName + " does not have WSDL. Generating WSDL...");
-
+
WsdlGenerator wsdlGenerator = getWsdlGenerator();
-
+
WsdlGeneratorOptions options = new WsdlGeneratorOptions();
options.setSAAJ(WsdlGeneratorOptions.SAAJ.SUN);
-
+
JaxWsImplementorInfo serviceInfo = new JaxWsImplementorInfo(serviceClass);
-
+
// set wsdl service
if (portInfo.getWsdlService() == null) {
options.setWsdlService(serviceInfo.getServiceName());
} else {
options.setWsdlService(portInfo.getWsdlService());
}
-
+
// set wsdl port
if (portInfo.getWsdlPort() != null) {
options.setWsdlPort(portInfo.getWsdlPort());
}
-
+
String wsdlFile = wsdlGenerator.generateWsdl(module, serviceClass.getName(), module.getEarContext(), options);
portInfo.setWsdlFile(wsdlFile);
-
+
LOG.debug("Generated " + wsdlFile + " for service " + serviceName);
- }
-
+ }
+
public static final GBeanInfo GBEAN_INFO;
static {
Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBEndpoint.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBEndpoint.java?rev=947901&r1=947900&r2=947901&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBEndpoint.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBEndpoint.java Tue May 25 03:26:52 2010
@@ -41,17 +41,16 @@ import org.apache.geronimo.cxf.GeronimoJ
import org.apache.geronimo.jaxws.JAXWSAnnotationProcessor;
import org.apache.geronimo.jaxws.JNDIResolver;
import org.apache.openejb.DeploymentInfo;
+import org.osgi.framework.Bundle;
public class EJBEndpoint extends CXFEndpoint {
-
- public EJBEndpoint(Bus bus,
- URL configurationBaseUrl,
- Class instance) {
- super(bus, instance);
-
+
+ public EJBEndpoint(Bus bus, Class instance, Bundle bundle) {
+ super(bus, instance, bundle);
+
implInfo = new GeronimoJaxWsImplementorInfo(instance, this.portInfo, instance.getClassLoader());
- serviceFactory = new JaxWsServiceFactoryBean(implInfo);
+ serviceFactory = new JaxWsServiceFactoryBean(implInfo);
serviceFactory.setBus(bus);
String wsdlLocation = null;
@@ -59,22 +58,22 @@ public class EJBEndpoint extends CXFEndp
wsdlLocation = this.portInfo.getWsdlFile();
} else {
wsdlLocation = implInfo.getWsdlLocation();
- }
- URL wsdlURL = getWsdlURL(configurationBaseUrl, wsdlLocation);
+ }
+ URL wsdlURL = getWsdlURL(bundle, wsdlLocation);
// install as first to overwrite annotations (wsdl-file, wsdl-port, wsdl-service)
- CXFServiceConfiguration configuration =
+ CXFServiceConfiguration configuration =
new CXFServiceConfiguration(this.portInfo, wsdlURL);
serviceFactory.getConfigurations().add(0, configuration);
- service = serviceFactory.create();
+ service = serviceFactory.create();
}
-
+
@Override
protected Class getImplementorClass() {
return (Class)this.implementor;
}
-
+
@Override
protected void init() {
// configure handlers
@@ -83,30 +82,30 @@ public class EJBEndpoint extends CXFEndp
} catch (Exception e) {
throw new WebServiceException("Error configuring handlers", e);
}
-
- DeploymentInfo deploymentInfo =
- (DeploymentInfo)bus.getExtension(DeploymentInfo.class);
-
- service.setInvoker(new EJBMethodInvoker(this, this.bus, deploymentInfo));
-
+
+ DeploymentInfo deploymentInfo =
+ bus.getExtension(DeploymentInfo.class);
+
+ service.setInvoker(new EJBMethodInvoker(this, this.bus, deploymentInfo));
+
Endpoint endpoint = getEndpoint();
-
- /*
+
+ /*
* Remove interceptors that perform handler processing since
* handler processing must happen within the EJB container.
- */
+ */
removeHandlerInterceptors(bus.getInInterceptors());
removeHandlerInterceptors(endpoint.getInInterceptors());
removeHandlerInterceptors(endpoint.getBinding().getInInterceptors());
removeHandlerInterceptors(endpoint.getService().getInInterceptors());
-
- // install SAAJ interceptor
+
+ // install SAAJ interceptor
if (endpoint.getBinding() instanceof SoapBinding &&
!this.implInfo.isWebServiceProvider()) {
endpoint.getService().getInInterceptors().add(new SAAJInInterceptor());
- }
+ }
}
-
+
private static void removeHandlerInterceptors(List<Interceptor> interceptors) {
for (Interceptor interceptor : interceptors) {
if (interceptor instanceof MustUnderstandInterceptor ||
@@ -114,16 +113,16 @@ public class EJBEndpoint extends CXFEndp
interceptor instanceof SOAPHandlerInterceptor) {
interceptors.remove(interceptor);
}
- }
+ }
}
-
+
@Override
public synchronized void injectHandlers() {
if (this.annotationProcessor != null) {
// assume injection was already done
return;
}
-
+
WebServiceContext wsContext = null;
try {
InitialContext ctx = new InitialContext();
@@ -131,11 +130,11 @@ public class EJBEndpoint extends CXFEndp
} catch (NamingException e) {
throw new WebServiceException("Failed to lookup WebServiceContext", e);
}
-
+
this.annotationProcessor = new JAXWSAnnotationProcessor(new JNDIResolver(), wsContext);
super.injectHandlers();
}
-
+
@Override
public void stop() {
// call handler preDestroy
@@ -144,5 +143,5 @@ public class EJBEndpoint extends CXFEndp
// shutdown server
super.stop();
}
-
+
}
Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBWebServiceContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBWebServiceContainer.java?rev=947901&r1=947900&r2=947901&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBWebServiceContainer.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBWebServiceContainer.java Tue May 25 03:26:52 2010
@@ -16,23 +16,20 @@
*/
package org.apache.geronimo.cxf.ejb;
-import java.net.URL;
-
import org.apache.cxf.Bus;
import org.apache.geronimo.cxf.CXFWebServiceContainer;
+import org.osgi.framework.Bundle;
public class EJBWebServiceContainer extends CXFWebServiceContainer {
-
- public EJBWebServiceContainer(Bus bus,
- URL configurationBaseUrl,
- Class target) {
- super(bus, configurationBaseUrl, target);
+
+ public EJBWebServiceContainer(Bus bus, Class target, Bundle bundle) {
+ super(bus, target, bundle);
}
-
+
protected EJBEndpoint publishEndpoint(Object target) {
assert target != null : "null target received";
- EJBEndpoint ep = new EJBEndpoint(bus, configurationBaseUrl, (Class)target);
+ EJBEndpoint ep = new EJBEndpoint(bus, (Class) target, bundle);
ep.publish(null);
return ep;
}
Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBWebServiceGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBWebServiceGBean.java?rev=947901&r1=947900&r2=947901&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBWebServiceGBean.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBWebServiceGBean.java Tue May 25 03:26:52 2010
@@ -25,12 +25,10 @@ import javax.naming.Context;
import org.apache.cxf.Bus;
import org.apache.geronimo.cxf.CXFCatalogUtils;
import org.apache.geronimo.cxf.CXFWebServiceContainer;
-import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.gbean.annotation.GBean;
-import org.apache.geronimo.gbean.annotation.ParamReference;
import org.apache.geronimo.gbean.annotation.ParamAttribute;
+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.j2eeobjectnames.NameFactory;
@@ -40,10 +38,11 @@ import org.apache.geronimo.jaxws.PortInf
import org.apache.geronimo.jaxws.ServerJNDIResolver;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.openejb.EjbDeployment;
-import org.apache.geronimo.webservices.SoapHandler;
import org.apache.geronimo.security.jaas.ConfigurationFactory;
+import org.apache.geronimo.webservices.SoapHandler;
import org.apache.openejb.DeploymentInfo;
import org.apache.openejb.core.CoreDeploymentInfo;
+import org.osgi.framework.Bundle;
@GBean(j2eeType = NameFactory.WEB_SERVICE_LINK)
public class EJBWebServiceGBean implements GBeanLifecycle {
@@ -55,7 +54,7 @@ public class EJBWebServiceGBean implemen
public EJBWebServiceGBean(@ParamReference(name="EjbDeployment")EjbDeployment ejbDeploymentContext,
@ParamAttribute(name="portInfo")PortInfo portInfo,
@ParamSpecial(type = SpecialAttributeType.kernel)Kernel kernel,
- @ParamAttribute(name="configurationBaseUrl")URL configurationBaseUrl,
+ @ParamSpecial(type=SpecialAttributeType.bundle) Bundle bundle,
@ParamReference(name="WebServiceContainer")Collection<SoapHandler> webContainers,
@ParamAttribute(name="policyContextID")String policyContextID,
@ParamReference(name="ConfigurationFactory")ConfigurationFactory configurationFactory,
@@ -66,50 +65,48 @@ public class EJBWebServiceGBean implemen
if (ejbDeploymentContext == null || webContainers == null || webContainers.isEmpty() || portInfo == null) {
return;
}
-
+
this.soapHandler = webContainers.iterator().next();
this.location = portInfo.getLocation();
-
+
assert this.location != null : "null location received";
-
- Class beanClass = ejbDeploymentContext.getBeanClass();
+
+ Class beanClass = ejbDeploymentContext.getBeanClass();
CoreDeploymentInfo deploymentInfo = ejbDeploymentContext.getDeploymentInfo();
Context context = deploymentInfo.getJndiEnc();
-
+
Bus bus = CXFWebServiceContainer.getBus();
bus.setExtension(new ServerJNDIResolver(context), JNDIResolver.class);
bus.setExtension(portInfo, PortInfo.class);
bus.setExtension(deploymentInfo, DeploymentInfo.class);
-
+
ClassLoader classLoader = ejbDeploymentContext.getClassLoader();
-
- URL catalog = JAXWSUtils.getOASISCatalogURL(configurationBaseUrl,
- classLoader,
- JAXWSUtils.DEFAULT_CATALOG_EJB);
+
+ URL catalog = JAXWSUtils.getOASISCatalogURL(bundle, JAXWSUtils.DEFAULT_CATALOG_EJB);
if (catalog != null) {
CXFCatalogUtils.loadOASISCatalog(bus, catalog);
}
-
- this.container = new EJBWebServiceContainer(bus, configurationBaseUrl, beanClass);
-
- soapHandler.addWebService(this.location,
- virtualHosts,
+
+ this.container = new EJBWebServiceContainer(bus, beanClass, bundle);
+
+ soapHandler.addWebService(this.location,
+ virtualHosts,
this.container,
policyContextID,
configurationFactory,
- realmName,
+ realmName,
authMethod,
properties,
- classLoader);
+ classLoader);
}
public void doStart() throws Exception {
}
- public void doStop() throws Exception {
+ public void doStop() throws Exception {
if (this.soapHandler != null) {
this.soapHandler.removeWebService(this.location);
- }
+ }
if (this.container != null) {
this.container.destroy();
}
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=947901&r1=947900&r2=947901&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 Tue May 25 03:26:52 2010
@@ -45,6 +45,8 @@ import org.apache.geronimo.jaxws.annotat
import org.apache.geronimo.jaxws.annotations.AnnotationProcessor;
import org.apache.geronimo.jaxws.handler.GeronimoHandlerResolver;
import org.apache.geronimo.xbeans.javaee.HandlerChainsType;
+import org.apache.xbean.osgi.bundle.util.BundleUtils;
+import org.osgi.framework.Bundle;
public abstract class CXFEndpoint {
@@ -66,33 +68,29 @@ public abstract class CXFEndpoint {
private String address;
- public CXFEndpoint(Bus bus, Object implementor) {
+ private Bundle bundle;
+
+ public CXFEndpoint(Bus bus, Object implementor, Bundle bundle) {
this.bus = bus;
this.implementor = implementor;
this.portInfo = bus.getExtension(PortInfo.class);
-
+ this.bundle = bundle;
this.bus.setExtension(this, CXFEndpoint.class);
}
- protected URL getWsdlURL(URL configurationBaseUrl, String wsdlFile) {
+ protected URL getWsdlURL(Bundle bundle, String wsdlFile) {
+ if (wsdlFile == null || wsdlFile.trim().length() == 0) {
+ return null;
+ }
URL wsdlURL = null;
- if (wsdlFile != null && wsdlFile.trim().length() > 0) {
- wsdlFile = wsdlFile.trim();
- try {
- wsdlURL = new URL(wsdlFile);
- } catch (MalformedURLException e) {
- // Not a URL, try as a resource
- wsdlURL = getImplementorClass().getResource("/" + wsdlFile);
-
- if (wsdlURL == null && configurationBaseUrl != null) {
- // Cannot get it as a resource, try with
- // configurationBaseUrl
- try {
- wsdlURL = new URL(configurationBaseUrl, wsdlFile);
- } catch (MalformedURLException ee) {
- // ignore
- }
- }
+ wsdlFile = wsdlFile.trim();
+ try {
+ wsdlURL = new URL(wsdlFile);
+ } catch (MalformedURLException e) {
+ // Not a URL, try as a resource
+ wsdlURL = bundle.getResource("/" + wsdlFile);
+ if (wsdlURL == null) {
+ wsdlURL = BundleUtils.getEntry(bundle, wsdlFile);
}
}
return wsdlURL;
@@ -199,11 +197,7 @@ public abstract class CXFEndpoint {
protected void initHandlers() throws Exception {
HandlerChainsType handlerChains =
HandlerChainsUtils.getHandlerChains(this.portInfo.getHandlersAsXML());
- GeronimoHandlerResolver handlerResolver =
- new GeronimoHandlerResolver(getImplementorClass().getClassLoader(),
- getImplementorClass(),
- handlerChains,
- null);
+ GeronimoHandlerResolver handlerResolver = new GeronimoHandlerResolver(bundle, getImplementorClass(), handlerChains, null);
PortInfoImpl portInfo = new PortInfoImpl(implInfo.getBindingType(),
serviceFactory.getEndpointName(),
Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainer.java?rev=947901&r1=947900&r2=947901&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainer.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainer.java Tue May 25 03:26:52 2010
@@ -19,12 +19,9 @@ package org.apache.geronimo.cxf;
import java.io.OutputStream;
import java.io.PrintWriter;
import java.net.URI;
-import java.net.URL;
import java.util.ArrayList;
import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.extension.ExtensionManagerBus;
@@ -33,33 +30,33 @@ import org.apache.cxf.tools.common.exten
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.geronimo.webservices.WebServiceContainer;
import org.apache.geronimo.webservices.saaj.SAAJUniverse;
+import org.osgi.framework.Bundle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class CXFWebServiceContainer implements WebServiceContainer {
private static final Logger LOG = LoggerFactory.getLogger(CXFWebServiceContainer.class);
-
+
protected final GeronimoDestination destination;
protected final Bus bus;
protected final CXFEndpoint endpoint;
- protected URL configurationBaseUrl;
+ protected final Bundle bundle;
- public CXFWebServiceContainer(Bus bus,
- URL configurationBaseUrl,
- Object target) {
+ public CXFWebServiceContainer(Bus bus, Object target, Bundle bundle) {
this.bus = bus;
- this.configurationBaseUrl = configurationBaseUrl;
-
+ this.bundle = bundle;
List ids = new ArrayList();
ids.add("http://schemas.xmlsoap.org/wsdl/soap/");
-
+
DestinationFactoryManager destinationFactoryManager = bus
.getExtension(DestinationFactoryManager.class);
GeronimoDestinationFactory factory = new GeronimoDestinationFactory(bus);
factory.setTransportIds(ids);
-
+
destinationFactoryManager.registerDestinationFactory(
"http://cxf.apache.org/transports/http/configuration", factory);
destinationFactoryManager.registerDestinationFactory(
@@ -80,7 +77,7 @@ public abstract class CXFWebServiceConta
static String getBaseUri(URI request) {
return request.getScheme() + "://" + request.getHost() + ":" + request.getPort() + request.getPath();
}
-
+
public void invoke(Request request, Response response) throws Exception {
this.endpoint.updateAddress(request.getURI());
if (request.getMethod() == Request.GET) {
@@ -89,7 +86,7 @@ public abstract class CXFWebServiceConta
processPOST(request, response);
}
}
-
+
protected void processGET(Request request, Response response) throws Exception {
if (request.getParameter("wsdl") != null || request.getParameter("WSDL") != null ||
request.getParameter("xsd") != null || request.getParameter("XSD") != null) {
@@ -115,7 +112,7 @@ public abstract class CXFWebServiceConta
processPOST(request, response);
}
}
-
+
protected void processPOST(Request request, Response response) throws Exception {
SAAJUniverse universe = new SAAJUniverse();
universe.set(SAAJUniverse.DEFAULT);
@@ -125,11 +122,11 @@ public abstract class CXFWebServiceConta
universe.unset();
}
}
-
+
public void getWsdl(Request request, Response response) throws Exception {
invoke(request, response);
- }
-
+ }
+
public void destroy() {
if (this.endpoint != null) {
this.endpoint.stop();
@@ -137,20 +134,20 @@ public abstract class CXFWebServiceConta
}
abstract protected CXFEndpoint publishEndpoint(Object target);
-
+
/*
- * Ensure the bus created is unqiue and non-shared.
+ * Ensure the bus created is unqiue and non-shared.
* The very first bus created is set as a default bus which then can
* be (re)used in other places.
*/
- public static Bus getBus() {
+ public static Bus getBus() {
getDefaultBus();
return new ExtensionManagerBus();
}
-
+
/*
* Ensure the Spring bus is initialized with the CXF module classloader
- * instead of the application classloader.
+ * instead of the application classloader.
*/
public static Bus getDefaultBus() {
ClassLoader cl = Thread.currentThread().getContextClassLoader();
@@ -161,5 +158,5 @@ public abstract class CXFWebServiceConta
Thread.currentThread().setContextClassLoader(cl);
}
}
-
+
}
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=947901&r1=947900&r2=947901&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 Tue May 25 03:26:52 2010
@@ -91,7 +91,7 @@ public class CXFServiceReference extends
JAXWSAnnotationProcessor annotationProcessor =
new JAXWSAnnotationProcessor(new JNDIResolver(), new WebServiceContextImpl());
GeronimoHandlerResolver handlerResolver =
- new GeronimoHandlerResolver(classLoader, serviceClass, getHandlerChains(), annotationProcessor);
+ new GeronimoHandlerResolver(bundle, serviceClass, getHandlerChains(), annotationProcessor);
return handlerResolver;
}
Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/pojo/POJOEndpoint.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/pojo/POJOEndpoint.java?rev=947901&r1=947900&r2=947901&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/pojo/POJOEndpoint.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/pojo/POJOEndpoint.java Tue May 25 03:26:52 2010
@@ -33,61 +33,60 @@ import org.apache.geronimo.cxf.GeronimoJ
import org.apache.geronimo.jaxws.JAXWSAnnotationProcessor;
import org.apache.geronimo.jaxws.JNDIResolver;
import org.apache.geronimo.jaxws.annotations.AnnotationHolder;
+import org.osgi.framework.Bundle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class POJOEndpoint extends CXFEndpoint {
private static final Logger LOG = LoggerFactory.getLogger(POJOEndpoint.class);
-
+
private AnnotationHolder holder;
- public POJOEndpoint(Bus bus,
- URL configurationBaseUrl,
- Class instance) {
- super(bus, instance);
-
+ public POJOEndpoint(Bus bus, Class instance, Bundle bundle) {
+ super(bus, instance, bundle);
+
implInfo = new GeronimoJaxWsImplementorInfo(instance, this.portInfo, instance.getClassLoader());
- serviceFactory = new JaxWsServiceFactoryBean(implInfo);
+ serviceFactory = new JaxWsServiceFactoryBean(implInfo);
serviceFactory.setBus(bus);
-
+
String wsdlLocation = null;
if (this.portInfo.getWsdlFile() != null) {
wsdlLocation = this.portInfo.getWsdlFile();
} else {
wsdlLocation = implInfo.getWsdlLocation();
- }
- URL wsdlURL = getWsdlURL(configurationBaseUrl, wsdlLocation);
+ }
+ URL wsdlURL = getWsdlURL(bundle, wsdlLocation);
// install as first to overwrite annotations (wsdl-file, wsdl-port, wsdl-service)
- CXFServiceConfiguration configuration =
+ CXFServiceConfiguration configuration =
new CXFServiceConfiguration(this.portInfo, wsdlURL);
serviceFactory.getConfigurations().add(0, configuration);
service = serviceFactory.create();
-
+
this.holder = bus.getExtension(AnnotationHolder.class);
-
+
Context context = bus.getExtension(Context.class);
-
+
// instantiate and inject resources into service
try {
- this.implementor = this.holder.newInstance(instance.getName(),
- instance.getClassLoader(),
+ this.implementor = this.holder.newInstance(instance.getName(),
+ instance.getClassLoader(),
context);
} catch (Exception e) {
throw new WebServiceException("Service resource injection failed", e);
}
-
- service.setInvoker(new JAXWSMethodInvoker(this.implementor));
- JNDIResolver jndiResolver = (JNDIResolver) bus.getExtension(JNDIResolver.class);
+ service.setInvoker(new JAXWSMethodInvoker(this.implementor));
+
+ JNDIResolver jndiResolver = bus.getExtension(JNDIResolver.class);
this.annotationProcessor = new JAXWSAnnotationProcessor(jndiResolver, new WebServiceContextImpl());
}
-
+
@Override
- protected void init() {
+ protected void init() {
// configure and inject handlers
try {
initHandlers();
@@ -107,7 +106,7 @@ public class POJOEndpoint extends CXFEnd
try {
this.holder.destroyInstance(this.implementor);
} catch (Exception e) {
- LOG.warn("Error calling @PreDestroy method", e);
+ LOG.warn("Error calling @PreDestroy method", e);
}
}
Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/pojo/POJOWebServiceContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/pojo/POJOWebServiceContainer.java?rev=947901&r1=947900&r2=947901&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/pojo/POJOWebServiceContainer.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/pojo/POJOWebServiceContainer.java Tue May 25 03:26:52 2010
@@ -16,25 +16,22 @@
*/
package org.apache.geronimo.cxf.pojo;
-import java.net.URL;
-
import org.apache.cxf.Bus;
import org.apache.geronimo.cxf.CXFEndpoint;
import org.apache.geronimo.cxf.CXFWebServiceContainer;
+import org.osgi.framework.Bundle;
public class POJOWebServiceContainer extends CXFWebServiceContainer {
-
- public POJOWebServiceContainer(Bus bus,
- URL configurationBaseUrl,
- Class target) {
- super(bus, configurationBaseUrl, target);
+
+ public POJOWebServiceContainer(Bus bus, Class target, Bundle bundle) {
+ super(bus, target, bundle);
this.destination.setPassSecurityContext(true);
}
protected CXFEndpoint publishEndpoint(Object target) {
assert target != null : "null target received";
- POJOEndpoint ep = new POJOEndpoint(bus, configurationBaseUrl, (Class)target);
+ POJOEndpoint ep = new POJOEndpoint(bus, (Class) target, bundle);
ep.publish(null);
return ep;
}
Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/pojo/POJOWebServiceContainerFactoryGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/pojo/POJOWebServiceContainerFactoryGBean.java?rev=947901&r1=947900&r2=947901&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/pojo/POJOWebServiceContainerFactoryGBean.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/pojo/POJOWebServiceContainerFactoryGBean.java Tue May 25 03:26:52 2010
@@ -18,16 +18,14 @@
package org.apache.geronimo.cxf.pojo;
import java.net.URL;
+import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
-import java.util.LinkedHashSet;
import javax.naming.Context;
import javax.naming.NamingException;
import javax.transaction.TransactionManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.cxf.Bus;
import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.geronimo.cxf.CXFCatalogUtils;
@@ -46,6 +44,9 @@ import org.apache.geronimo.naming.refere
import org.apache.geronimo.transaction.GeronimoUserTransaction;
import org.apache.geronimo.webservices.WebServiceContainer;
import org.apache.geronimo.webservices.WebServiceContainerFactory;
+import org.osgi.framework.Bundle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Rev: 508298 $ $Date: 2007-02-15 22:25:05 -0500 (Thu, 15 Feb 2007) $
@@ -56,13 +57,14 @@ public class POJOWebServiceContainerFact
private final Bus bus;
private final Class servletClass;
- private final URL configurationBaseUrl;
+ private final Bundle bundle;
public POJOWebServiceContainerFactoryGBean(PortInfo portInfo,
String endpointClassName,
ClassLoader classLoader,
Map componentContext,
Kernel kernel,
+ Bundle bundle,
TransactionManager transactionManager,
URL configurationBaseUrl,
AnnotationHolder holder,
@@ -80,11 +82,7 @@ public class POJOWebServiceContainerFact
GeronimoUserTransaction userTransaction = new GeronimoUserTransaction(transactionManager);
try {
- Context localContext = EnterpriseNamingContext.livenReferences(componentContext,
- userTransaction,
- kernel,
- classLoader,
- "comp/");
+ Context localContext = EnterpriseNamingContext.livenReferences(componentContext, userTransaction, kernel, classLoader, bundle, "comp/");
Set<Context> contexts = new LinkedHashSet<Context>(3);
contexts.add(localContext);
context = EnterpriseNamingContext.createEnterpriseNamingContext(contexts);
@@ -94,7 +92,7 @@ public class POJOWebServiceContainerFact
}
this.bus = CXFWebServiceContainer.getBus();
- this.configurationBaseUrl = configurationBaseUrl;
+ this.bundle = bundle;
this.servletClass = classLoader.loadClass(endpointClassName);
@@ -103,16 +101,14 @@ public class POJOWebServiceContainerFact
this.bus.setExtension(context, Context.class);
this.bus.setExtension(holder, AnnotationHolder.class);
- URL catalog = JAXWSUtils.getOASISCatalogURL(this.configurationBaseUrl,
- classLoader,
- JAXWSUtils.DEFAULT_CATALOG_WEB);
+ URL catalog = JAXWSUtils.getOASISCatalogURL(bundle, JAXWSUtils.DEFAULT_CATALOG_WEB);
if (catalog != null) {
CXFCatalogUtils.loadOASISCatalog(this.bus, catalog);
}
}
public WebServiceContainer getWebServiceContainer() {
- return new POJOWebServiceContainer(bus, configurationBaseUrl, servletClass);
+ return new POJOWebServiceContainer(bus, servletClass, bundle);
}
private static class WebServiceContextReference extends SimpleReference {
@@ -130,6 +126,7 @@ public class POJOWebServiceContainerFact
infoBuilder.addAttribute("classLoader", ClassLoader.class, false);
infoBuilder.addAttribute("componentContext", Map.class, true, true);
infoBuilder.addAttribute("kernel", Kernel.class, false);
+ infoBuilder.addAttribute("bundle", Bundle.class, false);
infoBuilder.addReference("TransactionManager", TransactionManager.class, NameFactory.JTA_RESOURCE);
infoBuilder.addAttribute("configurationBaseUrl", URL.class, true);
infoBuilder.addAttribute("holder", AnnotationHolder.class, true);
@@ -141,6 +138,7 @@ public class POJOWebServiceContainerFact
"classLoader",
"componentContext",
"kernel",
+ "bundle",
"TransactionManager",
"configurationBaseUrl",
"holder",
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/jndi/ApplicationJndi.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/jndi/ApplicationJndi.java?rev=947901&r1=947900&r2=947901&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/jndi/ApplicationJndi.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/jndi/ApplicationJndi.java Tue May 25 03:26:52 2010
@@ -20,6 +20,11 @@
package org.apache.geronimo.j2ee.jndi;
+import java.util.Map;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+
import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.gbean.annotation.GBean;
import org.apache.geronimo.gbean.annotation.ParamAttribute;
@@ -29,10 +34,7 @@ import org.apache.geronimo.gbean.annotat
import org.apache.geronimo.gjndi.FederatedContext;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.naming.enc.EnterpriseNamingContext;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-import java.util.Map;
+import org.osgi.framework.Bundle;
/**
* @version $Rev$ $Date$
@@ -48,12 +50,13 @@ public class ApplicationJndi implements
@ParamAttribute(name = "applicationContextMap") Map<String, Object> applicationContext,
@ParamReference(name = "GlobalContext", namingType = "Context") FederatedContext globalContext,
@ParamSpecial(type = SpecialAttributeType.kernel) Kernel kernel,
- @ParamSpecial(type = SpecialAttributeType.classLoader) ClassLoader classLoader
+ @ParamSpecial(type = SpecialAttributeType.classLoader) ClassLoader classLoader,
+ @ParamSpecial(type = SpecialAttributeType.bundle) Bundle bundle
) throws NamingException {
- this.globalAdditions = EnterpriseNamingContext.livenReferences(globalContextSegment, null, kernel, classLoader, JndiScope.global.name() + "/");
+ this.globalAdditions = EnterpriseNamingContext.livenReferences(globalContextSegment, null, kernel, classLoader, bundle, JndiScope.global.name() + "/");
this.globalContext = globalContext;
this.globalContext.federateContext(this.globalAdditions);
- this.applicationContext = EnterpriseNamingContext.livenReferences(applicationContext, null, kernel, classLoader, JndiScope.app.name() + "/");
+ this.applicationContext = EnterpriseNamingContext.livenReferences(applicationContext, null, kernel, classLoader, bundle, JndiScope.app.name() + "/");
}
public Context getApplicationContext() {
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/jndi/WebContextSource.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/jndi/WebContextSource.java?rev=947901&r1=947900&r2=947901&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/jndi/WebContextSource.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/jndi/WebContextSource.java Tue May 25 03:26:52 2010
@@ -20,7 +20,14 @@
package org.apache.geronimo.j2ee.jndi;
-import org.apache.geronimo.transaction.GeronimoUserTransaction;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.transaction.TransactionManager;
+
import org.apache.geronimo.gbean.annotation.GBean;
import org.apache.geronimo.gbean.annotation.ParamAttribute;
import org.apache.geronimo.gbean.annotation.ParamReference;
@@ -28,13 +35,8 @@ import org.apache.geronimo.gbean.annotat
import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.naming.enc.EnterpriseNamingContext;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.transaction.TransactionManager;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
+import org.apache.geronimo.transaction.GeronimoUserTransaction;
+import org.osgi.framework.Bundle;
/**
* @version $Rev$ $Date$
@@ -49,11 +51,12 @@ public class WebContextSource implements
@ParamReference(name = "TransactionManager") TransactionManager transactionManager,
@ParamReference(name = "ApplicationJndi") ApplicationJndi applicationJndi,
@ParamSpecial(type = SpecialAttributeType.classLoader) ClassLoader classLoader,
- @ParamSpecial(type = SpecialAttributeType.kernel) Kernel kernel) throws NamingException {
+ @ParamSpecial(type = SpecialAttributeType.kernel) Kernel kernel,
+ @ParamSpecial(type = SpecialAttributeType.bundle) Bundle bundle) throws NamingException {
GeronimoUserTransaction userTransaction = new GeronimoUserTransaction(transactionManager);
Set<Context> contexts = new LinkedHashSet<Context>(3);
- Context localCompContext = EnterpriseNamingContext.livenReferences(componentContext, userTransaction, kernel, classLoader, "comp/");
- Context localModuleContext = EnterpriseNamingContext.livenReferences(moduleContext, null, kernel, classLoader, "module/");
+ Context localCompContext = EnterpriseNamingContext.livenReferences(componentContext, userTransaction, kernel, classLoader, bundle, "comp/");
+ Context localModuleContext = EnterpriseNamingContext.livenReferences(moduleContext, null, kernel, classLoader, bundle, "module/");
contexts.add(localCompContext);
contexts.add(localModuleContext);
if (applicationJndi != null) {
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilderTest.java?rev=947901&r1=947900&r2=947901&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilderTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilderTest.java Tue May 25 03:26:52 2010
@@ -114,20 +114,20 @@ public class EnvironmentEntryBuilderTest
"<env-entry-type>java.lang.Boolean</env-entry-type>" +
"<env-entry-value>TRUE</env-entry-value>" +
"</env-entry>" +
-
+
"<env-entry>" +
"<env-entry-name>class</env-entry-name>" +
"<env-entry-type>java.lang.Class</env-entry-type>" +
"<env-entry-value>java.net.URI</env-entry-value>" +
"</env-entry>" +
-
+
"<env-entry>" +
"<env-entry-name>enum</env-entry-name>" +
"<env-entry-type>java.util.concurrent.TimeUnit</env-entry-type>" +
"<env-entry-value>NANOSECONDS</env-entry-value>" +
"</env-entry>" +
"</tmp>";
-
+
private static final String TEST_PLAN = "<tmp xmlns=\"http://geronimo.apache.org/xml/ns/naming-1.2\">" +
"<env-entry>" +
"<env-entry-name>string</env-entry-name>" +
@@ -173,13 +173,13 @@ public class EnvironmentEntryBuilderTest
"<env-entry-name>boolean</env-entry-name>" +
"<env-entry-value>FALSE</env-entry-value>" +
"</env-entry>" +
-
+
"<env-entry>" +
"<env-entry-name>class</env-entry-name>" +
"<env-entry-type>java.lang.Class</env-entry-type>" +
"<env-entry-value>java.net.URL</env-entry-value>" +
"</env-entry>" +
-
+
"<env-entry>" +
"<env-entry-name>enum</env-entry-name>" +
"<env-entry-type>java.util.concurrent.TimeUnit</env-entry-type>" +
@@ -188,7 +188,7 @@ public class EnvironmentEntryBuilderTest
"</tmp>";
private Module module;
-
+
protected void setUp() throws Exception {
Artifact artifact = new Artifact("foo", "bar", "1.0", "car");
Map<String, Artifact> locations = new HashMap<String, Artifact>();
@@ -213,7 +213,7 @@ public class EnvironmentEntryBuilderTest
module.setEarContext(earContext);
module.setRootEarContext(earContext);
}
-
+
public void testEnvEntries() throws Exception {
String stringVal = "Hello World";
@@ -235,7 +235,7 @@ public class EnvironmentEntryBuilderTest
cursor.dispose();
}
environmentEntryBuilder.buildNaming(doc, null, module, componentContext);
- Context context = EnterpriseNamingContext.livenReferences(NamingBuilder.JNDI_KEY.get(componentContext).get(JndiScope.comp), null, null, getClass().getClassLoader(), "comp/");
+ Context context = EnterpriseNamingContext.livenReferences(NamingBuilder.JNDI_KEY.get(componentContext).get(JndiScope.comp), null, null, getClass().getClassLoader(), null, "comp/");
Set actual = new HashSet();
for (NamingEnumeration e = context.listBindings("comp/env"); e.hasMore();) {
NameClassPair pair = (NameClassPair) e.next();
@@ -285,7 +285,7 @@ public class EnvironmentEntryBuilderTest
cursor.dispose();
}
environmentEntryBuilder.buildNaming(doc, plan, module, componentContext);
- Context context = EnterpriseNamingContext.livenReferences(NamingBuilder.JNDI_KEY.get(componentContext).get(JndiScope.comp), null, null, getClass().getClassLoader(), "comp/");
+ Context context = EnterpriseNamingContext.livenReferences(NamingBuilder.JNDI_KEY.get(componentContext).get(JndiScope.comp), null, null, getClass().getClassLoader(), null, "comp/");
Set actual = new HashSet();
for (NamingEnumeration e = context.listBindings("comp/env"); e.hasMore();) {
NameClassPair pair = (NameClassPair) e.next();
@@ -307,7 +307,7 @@ public class EnvironmentEntryBuilderTest
}
public void testEmptyEnvironment() throws NamingException {
- Context context = EnterpriseNamingContext.livenReferences(NamingBuilder.JNDI_KEY.get(componentContext).get(JndiScope.comp), null, null, null, "comp/");
+ Context context = EnterpriseNamingContext.livenReferences(NamingBuilder.JNDI_KEY.get(componentContext).get(JndiScope.comp), null, null, null, null, "comp/");
Context env = (Context) context.lookup("comp/env");
assertNotNull(env);
}
Modified: geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml?rev=947901&r1=947900&r2=947901&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml Tue May 25 03:26:52 2010
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
<module-id>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-server</artifactId>
@@ -27,33 +27,8 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-osgi-registry</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.howl</artifactId>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-bundleutils</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-finder</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-reflect</artifactId>
- <type>jar</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/history/dependencies.xml?rev=947901&r1=947900&r2=947901&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/history/dependencies.xml Tue May 25 03:26:52 2010
@@ -7,11 +7,6 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-transaction</artifactId>
<type>jar</type>
Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSServiceBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSServiceBuilder.java?rev=947901&r1=947900&r2=947901&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSServiceBuilder.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSServiceBuilder.java Tue May 25 03:26:52 2010
@@ -106,7 +106,7 @@ public abstract class JAXWSServiceBuilde
protected abstract Map<String, PortInfo> parseWebServiceDescriptor(InputStream in,
URL wsDDUrl,
- Deployable deployable,
+ Deployable deployable,
boolean isEJB,
Map correctedPortLocations)
throws DeploymentException;
@@ -140,8 +140,9 @@ public abstract class JAXWSServiceBuilde
Holder moduleHolder = null;
try {
GBeanData moduleGBean = context.getGBeanInstance(context.getModuleName());
- componentContext = (Map)moduleGBean.getAttribute("componentContext");
- moduleHolder = (Holder)moduleGBean.getAttribute("holder");
+ moduleHolder = (Holder) moduleGBean.getAttribute("holder");
+ GBeanData contextSourceGBean = context.getGBeanInstance(context.getNaming().createChildName(context.getModuleName(), "ContextSource", "ContextSource"));
+ componentContext = (Map) contextSourceGBean.getAttribute("componentContext");
} catch (GBeanNotFoundException e) {
LOG.warn("ModuleGBean not found. JNDI resource injection will not work.");
}
@@ -179,8 +180,7 @@ public abstract class JAXWSServiceBuilde
((EARContext)context).getTransactionManagerName());
}
- initialize(containerFactoryData, servletClass, portInfo, module);
-
+ initialize(containerFactoryData, servletClass, portInfo, module, bundle);
return true;
}
@@ -219,13 +219,12 @@ public abstract class JAXWSServiceBuilde
targetGBean.setAttribute("portInfo", portInfo);
- initialize(targetGBean, beanClass, portInfo, module);
+ initialize(targetGBean, beanClass, portInfo, module, bundle);
return true;
}
- protected void initialize(GBeanData targetGBean, Class wsClass, PortInfo info, Module module)
- throws DeploymentException {
+ protected void initialize(GBeanData targetGBean, Class wsClass, PortInfo info, Module module, Bundle bundle) throws DeploymentException {
}
Class<?> loadClass(String className, Bundle bundle) throws DeploymentException {
@@ -236,9 +235,8 @@ public abstract class JAXWSServiceBuilde
}
}
- protected boolean isWsdlSet(PortInfo portInfo, Class serviceClass) {
- return (portInfo.getWsdlFile() != null && !portInfo.getWsdlFile().trim().equals(""))
- || JAXWSUtils.containsWsdlLocation(serviceClass, serviceClass.getClassLoader());
+ protected boolean isWsdlSet(PortInfo portInfo, Class serviceClass, Bundle bundle) {
+ return (portInfo.getWsdlFile() != null && !portInfo.getWsdlFile().trim().equals("")) || JAXWSUtils.containsWsdlLocation(serviceClass, bundle);
}
protected boolean isHTTPBinding(PortInfo portInfo, Class serviceClass) {
@@ -248,7 +246,7 @@ public abstract class JAXWSServiceBuilde
if (portInfo.getProtocolBinding() != null) {
bindingURI = JAXWSUtils.getBindingURI(portInfo.getProtocolBinding());
}
- bindingURIFromAnnot = JAXWSUtils.getBindingURIFromAnnot(serviceClass, serviceClass.getClassLoader());
+ bindingURIFromAnnot = JAXWSUtils.getBindingURIFromAnnot(serviceClass);
if (bindingURI != null && !bindingURI.trim().equals("")) {
return bindingURI.equals(HTTPBinding.HTTP_BINDING);