svn commit: r1340051 - in /axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework: JAXWSDeployer.java JAXWSDeployerSupport.java JAXWSServiceBuilderExtension.java
Author: sagara
Date: Fri May 18 09:51:52 2012
New Revision: 1340051
URL: http://svn.apache.org/viewvc?rev=1340051&view=rev
Log:
AXIS2-5322 - Refactored JAXWSDeployer so that codes can be shared among
JAXWSDeployer and JAXWSServiceBuilderExtension through newly introduced
JAXWSDeployerSupport class. JAXWSServiceBuilderExtension support to deploy
JAX-WS artefacts based on service.xml file. Test coverage need to be added.
Added:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployerSupport.java
(with props)
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSServiceBuilderExtension.java
(with props)
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java?rev=1340051&r1=1340050&r2=1340051&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
Fri May 18 09:51:52 2012
@@ -27,26 +27,13 @@ import org.apache.axis2.deployment.Deplo
import org.apache.axis2.deployment.DeploymentErrorMsgs;
import org.apache.axis2.deployment.repository.util.DeploymentFileData;
import org.apache.axis2.deployment.util.Utils;
-import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.AxisServiceGroup;
-import org.apache.axis2.description.Parameter;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.i18n.Messages;
-import org.apache.axis2.jaxws.addressing.util.EndpointContextMap;
-import org.apache.axis2.jaxws.addressing.util.EndpointContextMapManager;
-import org.apache.axis2.jaxws.addressing.util.EndpointKey;
-import org.apache.axis2.jaxws.description.DescriptionFactory;
-import org.apache.axis2.jaxws.description.EndpointDescription;
-import org.apache.axis2.jaxws.server.JAXWSMessageReceiver;
-import org.apache.axis2.util.Loader;
import org.apache.commons.io.FileUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.jws.WebService;
-import javax.xml.namespace.QName;
-import javax.xml.ws.WebServiceProvider;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -104,7 +91,8 @@ public class JAXWSDeployer extends Abstr
getParameterValue(Constants.Configuration.ARTIFACTS_TEMP_DIR),
axisConfig.isChildFirstClassLoading());
Thread.currentThread().setContextClassLoader(classLoader);
-deployClasses("JAXWS-Builtin", file.toURL(),
Thread.currentThread().getContextClassLoader(), classList);
+JAXWSDeployerSupport deployerSupport = new
JAXWSDeployerSupport(configCtx, directory);
+deployerSupport.deployClasses("JAXWS-Builtin", file.toURL(),
Thread.currentThread().getContextClassLoader(), classList);
} catch (NoClassDefFoundError e) {
if (log.isDebugEnabled()) {
log.debug(Messages.getMessage("deployingexception",
e.getMessage()), e);
@@ -121,10 +109,10 @@ public class JAXWSDeployer extends Abstr
protected ArrayList getClassesInWebInfDirectory(File file) {
String filePath = file.getAbsolutePath();
-Collection files = FileUtils.listFiles(file, new String[]{"class"},
true);
+Collection files = FileUtils.listFiles(file, new
String[]{"class"}, true);
ArrayList classList = new ArrayList();
-for (Iterator iterator = files.iterator(); iterator.hasNext();) {
-File f = (File) iterator.next();
+for (Iterator iterator = files.iterator(); iterator.hasNext();) {
+File f = iterator.next();
String fPath = f.getAbsolutePath();
String fqcn = fPath.substring(filePath.length() + 1);
fqcn = fqcn.substring(0, fqcn.length() - ".class".length());
@@ -164,7 +152,8 @@ public class JAXWSDeployer extends Abstr
Thread.currentThread().setContextClassLoader(classLoader);
List classList =
Utils.getListOfClasses(deploymentFileData);
-AxisServiceGroup serviceGroup = deployClasses(groupName,
location, classLoader, classList);
+JAXWSDeployerSupport deployerSupport = new
JAXWSDeployerSupport(configCtx, directory);
+AxisServiceGroup serviceGroup =
deployerSupport.deployClasses(groupName, location, classLoader, classList);
if(serviceGroup == null) {
svn commit: r1340246 - in /axis/axis2/java/core/trunk/modules/jaxws: src/org/apache/axis2/datasource/jaxb/JAXBCustomBuilder.java src/org/apache/axis2/datasource/jaxb/JAXBDataSource.java test/org/apach
Author: veithen
Date: Fri May 18 20:52:41 2012
New Revision: 1340246
URL: http://svn.apache.org/viewvc?rev=1340246&view=rev
Log:
Use the feature introduced by AXIOM-399 instead of the "lossy prefix" stuff.
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBCustomBuilder.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDataSource.java
axis/axis2/java/core/trunk/modules/jaxws/test/org/apache/axis2/jaxws/message/BlockTests.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBCustomBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBCustomBuilder.java?rev=1340246&r1=1340245&r2=1340246&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBCustomBuilder.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBCustomBuilder.java
Fri May 18 20:52:41 2012
@@ -78,7 +78,10 @@ public class JAXBCustomBuilder implement
}
try {
// Create an OMSourcedElement backed by an unmarshalled JAXB object
-OMNamespace ns = factory.createOMNamespace(namespace,
reader.getPrefix());
+
+// Currently we cannot control how the unmarshaller will emit the
prefix
+// So if the value of the prefix is needed, full expansion is
necessary.
+OMNamespace ns = factory.createOMNamespace(namespace, null);
Object jaxb = jdsContext.unmarshal(reader);
if (log.isDebugEnabled()) {
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDataSource.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDataSource.java?rev=1340246&r1=1340245&r2=1340246&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDataSource.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDataSource.java
Fri May 18 20:52:41 2012
@@ -55,10 +55,6 @@ public class JAXBDataSource extends OMDa
super();
this.jaxb = jaxb;
this.context = context;
-
-// Currently we cannot control how the unmarshaller will emit the
prefix
-// So if the value of the prefix is needed, full expansion is
necessary.
-setProperty(OMDataSourceExt.LOSSY_PREFIX, Boolean.TRUE);
}
public void close() {
Modified:
axis/axis2/java/core/trunk/modules/jaxws/test/org/apache/axis2/jaxws/message/BlockTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/test/org/apache/axis2/jaxws/message/BlockTests.java?rev=1340246&r1=1340245&r2=1340246&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/test/org/apache/axis2/jaxws/message/BlockTests.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/test/org/apache/axis2/jaxws/message/BlockTests.java
Fri May 18 20:52:41 2012
@@ -581,7 +581,7 @@ public class BlockTests extends TestCase
OMFactory omFactory = OMAbstractFactory.getOMFactory();
JAXBDSContext dsContext = new JAXBDSContext(jaxbContext);
JAXBDataSource ds = new JAXBDataSource(jaxb, dsContext);
-OMNamespace ns =
omFactory.createOMNamespace(expectedQName.getNamespaceURI(), "pre");
+OMNamespace ns =
omFactory.createOMNamespace(expectedQName.getNamespaceURI(), null);
OMElement om = omFactory.createOMElement(ds,
expectedQName.getLocalPart(), ns);
svn commit: r1340287 - /axis/axis2/java/core/trunk/modules/integration/pom.xml
Author: veithen
Date: Fri May 18 22:23:29 2012
New Revision: 1340287
URL: http://svn.apache.org/viewvc?rev=1340287&view=rev
Log:
Don't lie. axis2-integration doesn't have any integration tests for JiBX.
Modified:
axis/axis2/java/core/trunk/modules/integration/pom.xml
Modified: axis/axis2/java/core/trunk/modules/integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/pom.xml?rev=1340287&r1=1340286&r2=1340287&view=diff
==
--- axis/axis2/java/core/trunk/modules/integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/integration/pom.xml Fri May 18 22:23:29
2012
@@ -93,11 +93,6 @@
org.apache.axis2
-${project.version}
-axis2-jibx
-
-
-org.apache.axis2
axis2-kernel
${project.version}
