JBossWS SVN: r17249 - stack/cxf/branches/jbossws-cxf-4.0.x.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-01-25 07:13:49 -0500 (Fri, 25 Jan 2013)
New Revision: 17249
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
Log:
Initialized merge tracking via "svnmerge" with revisions "1-17248" from
https://svn.jboss.org/repos/jbossws/stack/cxf/branches/jbossws-cxf-4.1.x
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-blocked
- https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:15645-15648,15650,156...!
051-17052,17057,17059-17060,17070,17073,17135-17136,17142,17170,17180,17187
+
Modified: svnmerge-integrated
- https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
+ /stack/cxf/branches/jbossws-cxf-4.1.x:1-17248
11 years, 3 months
JBossWS SVN: r17248 - stack/cxf/branches/jbossws-cxf-4.1.x.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-01-25 06:59:41 -0500 (Fri, 25 Jan 2013)
New Revision: 17248
Modified:
stack/cxf/branches/jbossws-cxf-4.1.x/
Log:
Blocked revisions 17219-17220,17224,17226,17243,17246 via svnmerge
.......
r17219 | alessio.soldano(a)jboss.com | 2013-01-08 18:23:40 +0100 (Tue, 08 Jan 2013) | 2 lines
Updating pom
.......
r17220 | alessio.soldano(a)jboss.com | 2013-01-08 18:26:48 +0100 (Tue, 08 Jan 2013) | 2 lines
Moving to 4.2.0-SNAPSHOT and consuming Apache CXF 2.7.2
.......
r17224 | jim.ma | 2013-01-09 11:14:59 +0100 (Wed, 09 Jan 2013) | 1 line
[JBWS-3395/JBWS-3396]:Enable parse the spring configuration xml generated from web.xml
.......
r17226 | alessio.soldano(a)jboss.com | 2013-01-09 13:37:30 +0100 (Wed, 09 Jan 2013) | 2 lines
[JBWS-3396] Few minor improvements and optimizations
.......
r17243 | alessio.soldano(a)jboss.com | 2013-01-24 19:07:36 +0100 (Thu, 24 Jan 2013) | 2 lines
Moving to cxf 2.7.3-snapshot
.......
r17246 | alessio.soldano(a)jboss.com | 2013-01-25 12:18:01 +0100 (Fri, 25 Jan 2013) | 2 lines
[JBWS-3589] Setting custom CXF compiler in ToolContext
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.1.x
___________________________________________________________________
Added: svnmerge-blocked
+ /stack/cxf/trunk:17219-17220,17224,17226,17243,17246
11 years, 3 months
JBossWS SVN: r17247 - stack/cxf/branches/jbossws-cxf-4.1.x.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-01-25 06:50:06 -0500 (Fri, 25 Jan 2013)
New Revision: 17247
Modified:
stack/cxf/branches/jbossws-cxf-4.1.x/
Log:
Initialized merge tracking via "svnmerge" with revisions "1-17199" from
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
Property changes on: stack/cxf/branches/jbossws-cxf-4.1.x
___________________________________________________________________
Added: svnmerge-integrated
+ /stack/cxf/trunk:1-17199
11 years, 3 months
JBossWS SVN: r17246 - stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-01-25 06:18:01 -0500 (Fri, 25 Jan 2013)
New Revision: 17246
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java
Log:
[JBWS-3589] Setting custom CXF compiler in ToolContext
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java 2013-01-25 11:08:14 UTC (rev 17245)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java 2013-01-25 11:18:01 UTC (rev 17246)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -24,12 +24,31 @@
import static org.jboss.wsf.stack.cxf.Messages.MESSAGES;
import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.io.PrintStream;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
+import java.util.Set;
+import javax.tools.FileObject;
+import javax.tools.ForwardingJavaFileManager;
+import javax.tools.JavaFileManager;
+import javax.tools.JavaFileObject;
+import javax.tools.JavaFileObject.Kind;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.StandardJavaFileManager;
+import javax.tools.StandardLocation;
+import javax.xml.ws.spi.Provider;
+
+import org.apache.cxf.common.util.Compiler;
import org.apache.cxf.helpers.FileUtils;
+import org.apache.cxf.tools.common.ToolConstants;
import org.apache.cxf.tools.common.ToolContext;
import org.apache.cxf.tools.wsdlto.WSDLToJava;
import org.jboss.ws.api.tools.WSContractConsumer;
@@ -257,7 +276,9 @@
WSDLToJava w2j = new WSDLToJava(args.toArray(new String[0]));
try
{
- w2j.run(new ToolContext(), stream);
+ ToolContext ctx = new ToolContext();
+ ctx.put(ToolConstants.COMPILER, new JBossModulesAwareCompiler());
+ w2j.run(ctx, stream);
}
catch (Throwable t)
{
@@ -279,4 +300,145 @@
}
}
}
+
+
+ /**
+ * A CXF Compiler that installs a custom JavaFileManager to load JAXWS and JAXB apis from
+ * the proper JBoss module (the one providing the JAXWS SPI Provider) instead of from the
+ * JDK boot classpath.
+ */
+ private final class JBossModulesAwareCompiler extends Compiler
+ {
+ @Override
+ protected JavaFileManager wrapJavaFileManager(StandardJavaFileManager standardJavaFileManger)
+ {
+ return new CustomJavaFileManager(standardJavaFileManger);
+ }
+ }
+
+ final class CustomJavaFileManager extends ForwardingJavaFileManager<JavaFileManager>
+ {
+ private ClassLoader classLoader = Provider.provider().getClass().getClassLoader();
+
+ protected CustomJavaFileManager(JavaFileManager fileManager)
+ {
+ super(fileManager);
+ }
+
+ public ClassLoader getClassLoader(Location location)
+ {
+ //TODO evaluate replacing with return new DelegateClassLoader(super.getClassLoader(location), classLoader);
+ return classLoader;
+ }
+
+ @Override
+ public FileObject getFileForInput(Location location, String packageName, String relativeName) throws IOException
+ {
+ return super.getFileForInput(location, packageName, relativeName);
+ }
+
+ @Override
+ public String inferBinaryName(Location loc, JavaFileObject file)
+ {
+ String result;
+ if (file instanceof JavaFileObjectImpl)
+ result = file.getName();
+ else
+ result = super.inferBinaryName(loc, file);
+ return result;
+ }
+
+ @Override
+ public Iterable<JavaFileObject> list(Location location, String packageName, Set<Kind> kinds, boolean recurse)
+ throws IOException
+ {
+ Iterable<JavaFileObject> result = super.list(location, packageName, kinds, recurse);
+ List<JavaFileObject> files = new ArrayList<JavaFileObject>();
+ if (location == StandardLocation.PLATFORM_CLASS_PATH && kinds.contains(JavaFileObject.Kind.CLASS))
+ {
+ List<JavaFileObject> resultFiltered = new ArrayList<JavaFileObject>();
+ for (Iterator<JavaFileObject> it = result.iterator(); it.hasNext();)
+ {
+ final JavaFileObject obj = it.next();
+ final String objName = obj.getName();
+ Class<?> clazz = null;
+ final String className = packageName + "." + objName.substring(0, objName.length() - 6);
+ try
+ {
+ clazz = classLoader.loadClass(className);
+ }
+ catch (ClassNotFoundException cnfe)
+ {
+ //NOOP
+ }
+ boolean added = false;
+ if (clazz != null)
+ {
+ ClassLoader loader = clazz.getClassLoader();
+ if (loader != null)
+ {
+ files.add(new JavaFileObjectImpl(className, loader));
+ added = true;
+ }
+ }
+ if (!added)
+ {
+ resultFiltered.add(obj);
+ }
+ }
+ for (JavaFileObject file : resultFiltered)
+ {
+ files.add(file);
+ }
+ }
+ else
+ {
+ for (JavaFileObject file : result)
+ {
+ files.add(file);
+ }
+ }
+ return files;
+ }
+ }
+
+ final class JavaFileObjectImpl extends SimpleJavaFileObject
+ {
+
+ private ClassLoader loader;
+
+ private final String key;
+
+ JavaFileObjectImpl(String fqClassName, ClassLoader loader)
+ {
+ super(toURI(fqClassName), JavaFileObject.Kind.CLASS);
+ this.loader = loader;
+ this.key = "/" + fqClassName.replace(".", "/") + ".class";
+ }
+
+ @Override
+ public InputStream openInputStream()
+ {
+ return loader.getResourceAsStream(key);
+ }
+
+ @Override
+ public OutputStream openOutputStream()
+ {
+ throw new UnsupportedOperationException();
+ }
+ }
+
+ static URI toURI(String name)
+ {
+ try
+ {
+ return new URI(name);
+ }
+ catch (URISyntaxException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
}
11 years, 3 months
JBossWS SVN: r17245 - stack/cxf/branches/jbossws-cxf-4.1.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-01-25 06:08:14 -0500 (Fri, 25 Jan 2013)
New Revision: 17245
Modified:
stack/cxf/branches/jbossws-cxf-4.1.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java
Log:
[JBWS-3589] Setting custom CXF compiler into ToolContext
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java 2013-01-25 11:06:29 UTC (rev 17244)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java 2013-01-25 11:08:14 UTC (rev 17245)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -24,12 +24,34 @@
import static org.jboss.wsf.stack.cxf.Messages.MESSAGES;
import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.io.PrintStream;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
import java.util.List;
+import java.util.Set;
+import javax.tools.FileObject;
+import javax.tools.ForwardingJavaFileManager;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaCompiler.CompilationTask;
+import javax.tools.JavaFileManager;
+import javax.tools.JavaFileObject;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.StandardJavaFileManager;
+import javax.tools.StandardLocation;
+import javax.tools.ToolProvider;
+import javax.xml.ws.spi.Provider;
+
+import org.apache.cxf.common.util.Compiler;
import org.apache.cxf.helpers.FileUtils;
+import org.apache.cxf.tools.common.ToolConstants;
import org.apache.cxf.tools.common.ToolContext;
import org.apache.cxf.tools.wsdlto.WSDLToJava;
import org.jboss.ws.api.tools.WSContractConsumer;
@@ -257,7 +279,9 @@
WSDLToJava w2j = new WSDLToJava(args.toArray(new String[0]));
try
{
- w2j.run(new ToolContext(), stream);
+ ToolContext ctx = new ToolContext();
+ ctx.put(ToolConstants.COMPILER, new JBossModulesAwareCompiler());
+ w2j.run(ctx, stream);
}
catch (Throwable t)
{
@@ -279,4 +303,153 @@
}
}
}
+
+ /**
+ * A CXF Compiler that installs a custom JavaFileManager to load JAXWS and JAXB apis from
+ * the proper JBoss module (the one providing the JAXWS SPI Provider) instead of from the
+ * JDK boot classpath.
+ */
+ private final class JBossModulesAwareCompiler extends Compiler
+ {
+ @Override
+ protected boolean useJava6Compiler(String[] files) throws Exception
+ {
+ JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
+ StandardJavaFileManager stdFileManager = compiler.getStandardFileManager(null, null, null);
+ Iterable<? extends JavaFileObject> fileList = stdFileManager.getJavaFileObjectsFromStrings(Arrays.asList(files));
+ JavaFileManager fileManager = new CustomJavaFileManager(stdFileManager);
+
+ List<String> args = new ArrayList<String>();
+ addArgs(args);
+ CompilationTask task = compiler.getTask(null, fileManager, null, args, null, fileList);
+ Boolean ret = task.call();
+ fileManager.close();
+ return ret;
+ }
+ }
+
+ final class CustomJavaFileManager extends ForwardingJavaFileManager<JavaFileManager>
+ {
+ private ClassLoader classLoader = Provider.provider().getClass().getClassLoader();
+
+ protected CustomJavaFileManager(JavaFileManager fileManager)
+ {
+ super(fileManager);
+ }
+
+ public ClassLoader getClassLoader(Location location)
+ {
+ //TODO evaluate replacing with return new DelegateClassLoader(super.getClassLoader(location), classLoader);
+ return classLoader;
+ }
+
+ @Override
+ public FileObject getFileForInput(Location location, String packageName, String relativeName) throws IOException
+ {
+ return super.getFileForInput(location, packageName, relativeName);
+ }
+
+ @Override
+ public String inferBinaryName(Location loc, JavaFileObject file)
+ {
+ String result;
+ if (file instanceof JavaFileObjectImpl)
+ result = file.getName();
+ else
+ result = super.inferBinaryName(loc, file);
+ return result;
+ }
+
+ @Override
+ public Iterable<JavaFileObject> list(Location location, String packageName, Set<JavaFileObject.Kind> kinds, boolean recurse)
+ throws IOException
+ {
+ Iterable<JavaFileObject> result = super.list(location, packageName, kinds, recurse);
+ List<JavaFileObject> files = new ArrayList<JavaFileObject>();
+ if (location == StandardLocation.PLATFORM_CLASS_PATH && kinds.contains(JavaFileObject.Kind.CLASS))
+ {
+ List<JavaFileObject> resultFiltered = new ArrayList<JavaFileObject>();
+ for (Iterator<JavaFileObject> it = result.iterator(); it.hasNext();)
+ {
+ final JavaFileObject obj = it.next();
+ final String objName = obj.getName();
+ Class<?> clazz = null;
+ final String className = packageName + "." + objName.substring(0, objName.length() - 6);
+ try
+ {
+ clazz = classLoader.loadClass(className);
+ }
+ catch (ClassNotFoundException cnfe)
+ {
+ //NOOP
+ }
+ boolean added = false;
+ if (clazz != null)
+ {
+ ClassLoader loader = clazz.getClassLoader();
+ if (loader != null)
+ {
+ files.add(new JavaFileObjectImpl(className, loader));
+ added = true;
+ }
+ }
+ if (!added)
+ {
+ resultFiltered.add(obj);
+ }
+ }
+ for (JavaFileObject file : resultFiltered)
+ {
+ files.add(file);
+ }
+ }
+ else
+ {
+ for (JavaFileObject file : result)
+ {
+ files.add(file);
+ }
+ }
+ return files;
+ }
+ }
+
+ final class JavaFileObjectImpl extends SimpleJavaFileObject
+ {
+
+ private ClassLoader loader;
+
+ private final String key;
+
+ JavaFileObjectImpl(String fqClassName, ClassLoader loader)
+ {
+ super(toURI(fqClassName), JavaFileObject.Kind.CLASS);
+ this.loader = loader;
+ this.key = "/" + fqClassName.replace(".", "/") + ".class";
+ }
+
+ @Override
+ public InputStream openInputStream()
+ {
+ return loader.getResourceAsStream(key);
+ }
+
+ @Override
+ public OutputStream openOutputStream()
+ {
+ throw new UnsupportedOperationException();
+ }
+ }
+
+ static URI toURI(String name)
+ {
+ try
+ {
+ return new URI(name);
+ }
+ catch (URISyntaxException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
}
11 years, 3 months
JBossWS SVN: r17244 - stack/cxf/branches/jbossws-cxf-4.1.x.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-01-25 06:06:29 -0500 (Fri, 25 Jan 2013)
New Revision: 17244
Modified:
stack/cxf/branches/jbossws-cxf-4.1.x/pom.xml
Log:
[JBWS-3590] Moving to CXF 2.6.6-SNAPSHOT
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/pom.xml 2013-01-24 18:07:36 UTC (rev 17243)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/pom.xml 2013-01-25 11:06:29 UTC (rev 17244)
@@ -73,7 +73,7 @@
<jboss713.version>7.1.3.Final</jboss713.version>
<jboss720.version>7.2.0.Alpha1-SNAPSHOT</jboss720.version>
<ejb.api.version>1.0.1.Final</ejb.api.version>
- <cxf.version>2.6.5</cxf.version>
+ <cxf.version>2.6.6-SNAPSHOT</cxf.version>
<cxf.asm.version>3.3.1</cxf.asm.version>
<cxf.xjcplugins.version>2.6.0</cxf.xjcplugins.version>
<jboss.common.core.version>2.2.17.GA</jboss.common.core.version>
11 years, 3 months
JBossWS SVN: r17243 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-01-24 13:07:36 -0500 (Thu, 24 Jan 2013)
New Revision: 17243
Modified:
stack/cxf/trunk/pom.xml
Log:
Moving to cxf 2.7.3-snapshot
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2013-01-22 09:48:17 UTC (rev 17242)
+++ stack/cxf/trunk/pom.xml 2013-01-24 18:07:36 UTC (rev 17243)
@@ -73,7 +73,7 @@
<jboss713.version>7.1.3.Final</jboss713.version>
<jboss720.version>7.2.0.Alpha1-SNAPSHOT</jboss720.version>
<ejb.api.version>1.0.1.Final</ejb.api.version>
- <cxf.version>2.7.2</cxf.version>
+ <cxf.version>2.7.3-SNAPSHOT</cxf.version>
<cxf.asm.version>3.3.1</cxf.asm.version>
<cxf.xjcplugins.version>2.6.0</cxf.xjcplugins.version>
<jboss.common.core.version>2.2.17.GA</jboss.common.core.version>
11 years, 3 months
JBossWS SVN: r17242 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594: ant-import and 8 other directories.
by jbossws-commits＠lists.jboss.org
Author: mmusaji
Date: 2013-01-22 04:48:17 -0500 (Tue, 22 Jan 2013)
New Revision: 17242
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/
stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/ant-import-tests/build-jars-jaxws.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/ant-import/macros-deploy-native.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/
stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/Constants.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/EncryptionOperation.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/STRTransform.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/element/SecurityHeader.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/test/java/org/jboss/test/ws/jaxws/
stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/test/resources/jaxws/
stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/test/resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/test/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF/jboss-wsse-server.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/version.properties
Log:
[JBPAPP-10594] Backport JBPAPP-7601 - Move to Santuario 1.5.2 and add GCM algorithm support
Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594
___________________________________________________________________
Added: svn:mergeinfo
+ /stack/native/branches/jbossws-native-2.0.1.SP2_CP:17228
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/ant-import/macros-deploy-native.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/ant-import/macros-deploy-native.xml 2013-01-21 12:11:38 UTC (rev 17241)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/ant-import/macros-deploy-native.xml 2013-01-22 09:48:17 UTC (rev 17242)
@@ -143,6 +143,7 @@
<include name="policy.jar"/>
<include name="stax-ex.jar"/>
<include name="streambuffer.jar"/>
+ <include name="xmlsec.jar"/>
<include name="wsdl4j.jar"/>
</fileset>
</copy>
@@ -182,6 +183,7 @@
<include name="policy.jar"/>
<include name="stax-ex.jar"/>
<include name="streambuffer.jar"/>
+ <include name="xmlsec.jar"/>
<include name="wsdl4j.jar"/>
<!-- Remove only, do not deploy -->
<include name="jbossws-wsconsume-impl.jar"/>
Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/ant-import-tests/build-jars-jaxws.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml:14048
+ /stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml:17228
/stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml:14048
Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/trunk/modules/core/src/main/java:11162
+ /stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java:17228
/stack/native/trunk/modules/core/src/main/java:11162
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/Constants.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/Constants.java 2013-01-21 12:11:38 UTC (rev 17241)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/Constants.java 2013-01-22 09:48:17 UTC (rev 17242)
@@ -51,7 +51,7 @@
public static final String XML_ENCRYPTION_NS = EncryptionConstants.EncryptionSpecNS;
- public static final String XML_ENCRYPTION_PREFIX = "xenc";
+ public static final String XML_ENCRYPTION_PREFIX = "ds"; //xmlsec 1.4.2 requires this to be "ds" to correctly create KeyInfo elements
public static final String ID = "Id";
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/EncryptionOperation.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/EncryptionOperation.java 2013-01-21 12:11:38 UTC (rev 17241)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/EncryptionOperation.java 2013-01-22 09:48:17 UTC (rev 17242)
@@ -71,6 +71,9 @@
algorithms.put("aes-128", new Algorithm("AES", XMLCipher.AES_128, 128));
algorithms.put("aes-192", new Algorithm("AES", XMLCipher.AES_192, 192));
algorithms.put("aes-256", new Algorithm("AES", XMLCipher.AES_256, 256));
+ algorithms.put("aes-128-gcm", new Algorithm("AES", XMLCipher.AES_128_GCM, 128));
+ algorithms.put("aes-192-gcm", new Algorithm("AES", XMLCipher.AES_192_GCM, 192));
+ algorithms.put("aes-256-gcm", new Algorithm("AES", XMLCipher.AES_256_GCM, 256));
algorithms.put("tripledes", new Algorithm("TripleDes", XMLCipher.TRIPLEDES, 168));
}
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/STRTransform.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/STRTransform.java 2013-01-21 12:11:38 UTC (rev 17241)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/STRTransform.java 2013-01-22 09:48:17 UTC (rev 17242)
@@ -22,6 +22,7 @@
package org.jboss.ws.extensions.security;
import java.io.IOException;
+import java.io.OutputStream;
import javax.xml.parsers.ParserConfigurationException;
@@ -91,7 +92,14 @@
@Override
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input) throws IOException, CanonicalizationException,
+ protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input, Transform transformObject) throws IOException, CanonicalizationException,
+ InvalidCanonicalizerException, TransformationException, ParserConfigurationException, SAXException
+ {
+ return enginePerformTransform(input, null, transformObject);
+ }
+
+ @Override
+ protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input, OutputStream os, Transform transformObject) throws IOException, CanonicalizationException,
InvalidCanonicalizerException, TransformationException, ParserConfigurationException, SAXException
{
@@ -115,7 +123,7 @@
element = token.getSTRTransformElement();
// Obtain the canonicalizer specified in the transformation parameters
- Element parameters = XMLUtils.selectNode(this._transformObject.getElement().getFirstChild(), Constants.WSSE_NS,
+ Element parameters = XMLUtils.selectNode(transformObject.getElement().getFirstChild(), Constants.WSSE_NS,
"TransformationParameters", 0);
if (parameters == null)
throw new TransformationException("wsse:TransformationParameters expected!");
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java 2013-01-21 12:11:38 UTC (rev 17241)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java 2013-01-22 09:48:17 UTC (rev 17242)
@@ -75,6 +75,7 @@
try
{
cipher = XMLCipher.getInstance();
+ cipher.init(XMLCipher.DECRYPT_MODE, null);
key = cipher.loadEncryptedKey(element);
}
catch (XMLSecurityException e)
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/element/SecurityHeader.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/element/SecurityHeader.java 2013-01-21 12:11:38 UTC (rev 17241)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/main/java/org/jboss/ws/extensions/security/element/SecurityHeader.java 2013-01-22 09:48:17 UTC (rev 17242)
@@ -172,6 +172,7 @@
Element element = document.createElementNS(Constants.WSSE_NS, Constants.WSSE_HEADER);
Util.addNamespace(element, Constants.WSSE_PREFIX, Constants.WSSE_NS);
Util.addNamespace(element, Constants.WSU_PREFIX, Constants.WSU_NS);
+ Util.addNamespace(element, Constants.XML_ENCRYPTION_PREFIX, Constants.XML_SIGNATURE_NS);
if (timestamp != null)
element.appendChild(timestamp.getElement());
Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/test/java/org/jboss/test/ws/jaxws
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws:14048
+ /stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws:17228
/stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws:14048
Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/test/resources/jaxws
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws:14048
+ /stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws:17228
/stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws:14048
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/test/resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/test/resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml 2013-01-21 12:11:38 UTC (rev 17241)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/test/resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml 2013-01-22 09:48:17 UTC (rev 17242)
@@ -3,7 +3,7 @@
<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
<config>
- <encrypt type="x509v3" alias="wsse"/>
+ <encrypt type="x509v3" algorithm="aes-128-gcm" alias="wsse"/>
<requires>
<encryption/>
</requires>
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/test/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF/jboss-wsse-server.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/test/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF/jboss-wsse-server.xml 2013-01-21 12:11:38 UTC (rev 17241)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/src/test/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF/jboss-wsse-server.xml 2013-01-22 09:48:17 UTC (rev 17242)
@@ -7,7 +7,7 @@
<trust-store-file>WEB-INF/wsse.truststore</trust-store-file>
<trust-store-password>jbossws</trust-store-password>
<config>
- <encrypt type="x509v3" alias="wsse"/>
+ <encrypt type="x509v3" algorithm="aes-128-gcm" alias="wsse"/>
<requires>
<encryption/>
</requires>
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/version.properties
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/version.properties 2013-01-21 12:11:38 UTC (rev 17241)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/version.properties 2013-01-22 09:48:17 UTC (rev 17242)
@@ -15,7 +15,7 @@
implementation.vendor.id=http://www.jboss.org
# Thirdparty library versions that are referenced in component-info.xml
-apache-xmlsec=1.3.0
+apache-xmlsec=1.5.2
ibm-wsdl4j=1.6.2
jbpm-bpel=1.1.0.Beta5
stax-api=1.0
11 years, 3 months
JBossWS SVN: r17241 - stack/native/branches.
by jbossws-commits＠lists.jboss.org
Author: mmusaji
Date: 2013-01-21 07:11:38 -0500 (Mon, 21 Jan 2013)
New Revision: 17241
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_CP10_JBPAPP-10594/
Log:
[JBPAPP6-10594] - Create one off patch branch
11 years, 3 months
JBossWS SVN: r17240 - thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws.
by jbossws-commits＠lists.jboss.org
Author: mmusaji
Date: 2013-01-21 06:53:27 -0500 (Mon, 21 Jan 2013)
New Revision: 17240
Modified:
thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java
Log:
[JBPAPP-10458] Ensure @XMLJavaTypeAdapter is picked up at package-info level
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java 2013-01-18 04:30:36 UTC (rev 17239)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java 2013-01-21 11:53:27 UTC (rev 17240)
@@ -38,6 +38,7 @@
import javax.xml.bind.annotation.XmlMimeType;
import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
import javax.xml.namespace.QName;
import javax.xml.ws.Holder;
@@ -262,11 +263,47 @@
getClassCode(XmlNsForm.class),
q ? "QUALIFIED" : "UNQUALIFIED");
av0.visitEnd();
+
+ if (clz.getPackage() != null && clz.getPackage().getAnnotations() != null) {
+ for (Annotation ann : clz.getPackage().getAnnotations()) {
+ if (ann instanceof XmlJavaTypeAdapters) {
+ av0 = cw.visitAnnotation("Ljavax/xml/bind/annotation/adapters/XmlJavaTypeAdapters;",
+ true);
+ generateXmlJavaTypeAdapters(av0, (XmlJavaTypeAdapters)ann);
+ av0.visitEnd();
+ } else if (ann instanceof XmlJavaTypeAdapter) {
+ av0 = cw.visitAnnotation("Ljavax/xml/bind/annotation/adapters/XmlJavaTypeAdapter;",
+ true);
+ generateXmlJavaTypeAdapter(av0, (XmlJavaTypeAdapter)ann);
+ av0.visitEnd();
+ }
+ }
+ }
cw.visitEnd();
-
+
loadClass(className, clz, cw.toByteArray());
}
+ private void generateXmlJavaTypeAdapters(AnnotationVisitor av, XmlJavaTypeAdapters adapters) {
+ AnnotationVisitor av1 = av.visitArray("value");
+
+ for (XmlJavaTypeAdapter adapter : adapters.value()) {
+ AnnotationVisitor av2
+ = av1.visitAnnotation(null, "Ljavax/xml/bind/annotation/adapters/XmlJavaTypeAdapter;");
+ generateXmlJavaTypeAdapter(av2, adapter);
+ av2.visitEnd();
+ }
+ av1.visitEnd();
+ }
+ private void generateXmlJavaTypeAdapter(AnnotationVisitor av, XmlJavaTypeAdapter adapter) {
+ if (adapter.value() != null) {
+ av.visit("value", org.objectweb.asm.Type.getType(getClassCode(adapter.value())));
+ }
+ if (adapter.type() != javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter.DEFAULT.class) {
+ av.visit("type", org.objectweb.asm.Type.getType(getClassCode(adapter.type())));
+ }
+ }
+
private void generateMessagePart(ClassWriter cw, MessagePartInfo mpi, Method method, String className) {
if (Boolean.TRUE.equals(mpi.getProperty(ReflectionServiceFactoryBean.HEADER))) {
return;
@@ -373,13 +410,7 @@
av0.visitEnd();
} else if (ann instanceof XmlJavaTypeAdapter) {
av0 = fv.visitAnnotation("Ljavax/xml/bind/annotation/adapters/XmlJavaTypeAdapter;", true);
- XmlJavaTypeAdapter adapter = (XmlJavaTypeAdapter)ann;
- if (adapter.value() != null) {
- av0.visit("value", org.objectweb.asm.Type.getType(getClassCode(adapter.value())));
- }
- if (adapter.type() != javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter.DEFAULT.class) {
- av0.visit("type", org.objectweb.asm.Type.getType(getClassCode(adapter.type())));
- }
+ generateXmlJavaTypeAdapter(av0, (XmlJavaTypeAdapter)ann);
av0.visitEnd();
} else if (ann instanceof XmlAttachmentRef) {
av0 = fv.visitAnnotation("Ljavax/xml/bind/annotation/XmlAttachmentRef;", true);
11 years, 3 months