svn commit: r1332965 - in /axis/axis2/java/transports/trunk: ./ modules/samples/ modules/samples/https-sample/ modules/samples/https-sample/httpsClient/ modules/samples/https-sample/httpsClient/src/ m
Author: sagara Date: Wed May 2 09:29:03 2012 New Revision: 1332965 URL: http://svn.apache.org/viewvc?rev=1332965&view=rev Log: TRANSPORTS-50 - Added a sample to demonstrate use of HTTPS transport. This sample is based on Jetty Maven plug-in and keytool-maven-plugin. Added: axis/axis2/java/transports/trunk/modules/samples/ axis/axis2/java/transports/trunk/modules/samples/https-sample/ axis/axis2/java/transports/trunk/modules/samples/https-sample/README.txt (with props) axis/axis2/java/transports/trunk/modules/samples/https-sample/httpsClient/ axis/axis2/java/transports/trunk/modules/samples/https-sample/httpsClient/pom.xml (with props) axis/axis2/java/transports/trunk/modules/samples/https-sample/httpsClient/src/ axis/axis2/java/transports/trunk/modules/samples/https-sample/httpsClient/src/main/ axis/axis2/java/transports/trunk/modules/samples/https-sample/httpsClient/src/main/java/ axis/axis2/java/transports/trunk/modules/samples/https-sample/httpsClient/src/main/java/org/ axis/axis2/java/transports/trunk/modules/samples/https-sample/httpsClient/src/main/java/org/apache/ axis/axis2/java/transports/trunk/modules/samples/https-sample/httpsClient/src/main/java/org/apache/axis2/ axis/axis2/java/transports/trunk/modules/samples/https-sample/httpsClient/src/main/java/org/apache/axis2/examples/ axis/axis2/java/transports/trunk/modules/samples/https-sample/httpsClient/src/main/java/org/apache/axis2/examples/httpsclient/ axis/axis2/java/transports/trunk/modules/samples/https-sample/httpsClient/src/main/java/org/apache/axis2/examples/httpsclient/SimpleServiceClient.java (with props) axis/axis2/java/transports/trunk/modules/samples/https-sample/httpsService/ axis/axis2/java/transports/trunk/modules/samples/https-sample/httpsService/pom.xml (with props) axis/axis2/java/transports/trunk/modules/samples/https-sample/httpsService/src/ axis/axis2/java/transports/trunk/modules/samples/https-sample/httpsService/src/main/ axis/axis2/java/transports/trunk/modules/samples/https-sample/httpsService/src/main/java/ axis/axis2/java/transports/trunk/modules/samples/https-sample/httpsService/src/main/java/org/ axis/axis2/java/transports/trunk/modules/samples/https-sample/httpsService/src/main/java/org/apache/ axis/axis2/java/transports/trunk/modules/samples/https-sample/httpsService/src/main/java/org/apache/axis2/ axis/axis2/java/transports/trunk/modules/samples/https-sample/httpsService/src/main/java/org/apache/axis2/examples/ axis/axis2/java/transports/trunk/modules/samples/https-sample/httpsService/src/main/java/org/apache/axis2/examples/httpsservice/ axis/axis2/java/transports/trunk/modules/samples/https-sample/httpsService/src/main/java/org/apache/axis2/examples/httpsservice/SimpleService.java (with props) axis/axis2/java/transports/trunk/modules/samples/https-sample/httpsService/src/main/webapp/ axis/axis2/java/transports/trunk/modules/samples/https-sample/httpsService/src/main/webapp/WEB-INF/ axis/axis2/java/transports/trunk/modules/samples/https-sample/httpsService/src/main/webapp/WEB-INF/axis2.xml (with props) axis/axis2/java/transports/trunk/modules/samples/https-sample/httpsService/src/main/webapp/WEB-INF/services/ axis/axis2/java/transports/trunk/modules/samples/https-sample/httpsService/src/main/webapp/WEB-INF/services/SimpleService/ axis/axis2/java/transports/trunk/modules/samples/https-sample/httpsService/src/main/webapp/WEB-INF/services/SimpleService/META-INF/ axis/axis2/java/transports/trunk/modules/samples/https-sample/httpsService/src/main/webapp/WEB-INF/services/SimpleService/META-INF/services.xml (with props) axis/axis2/java/transports/trunk/modules/samples/https-sample/httpsService/src/main/webapp/WEB-INF/web.xml (with props) axis/axis2/java/transports/trunk/modules/samples/https-sample/pom.xml (with props) Modified: axis/axis2/java/transports/trunk/pom.xml Added: axis/axis2/java/transports/trunk/modules/samples/https-sample/README.txt URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/samples/https-sample/README.txt?rev=1332965&view=auto == --- axis/axis2/java/transports/trunk/modules/samples/https-sample/README.txt (added) +++ axis/axis2/java/transports/trunk/modules/samples/https-sample/README.txt Wed May 2 09:29:03 2012 @@ -0,0 +1,52 @@ +Sample: HTTPS Sample +=== + +Introduction + + +This sample demonstrate use of HTTPS transport in both server and client sides. Jetty Maven plug-in used as +the web server and keytool-maven-plugin is used to generate secure key for the sample further same generated +key is used in client side too. This sample does not try to introduce secure key management best practices, +but in real world scenarios it's recommended to follow standard key managem
svn commit: r1332990 - /axis/axis2/java/transports/trunk/pom.xml
Author: sagara Date: Wed May 2 10:52:45 2012 New Revision: 1332990 URL: http://svn.apache.org/viewvc?rev=1332990&view=rev Log: Moved sample into a new profiles. Modified: axis/axis2/java/transports/trunk/pom.xml Modified: axis/axis2/java/transports/trunk/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/pom.xml?rev=1332990&r1=1332989&r2=1332990&view=diff == --- axis/axis2/java/transports/trunk/pom.xml (original) +++ axis/axis2/java/transports/trunk/pom.xml Wed May 2 10:52:45 2012 @@ -157,7 +157,6 @@ modules/sms modules/testkit modules/all -modules/samples/https-sample @@ -270,6 +269,16 @@ + + + +everything + +modules/samples/https-sample + +
svn commit: r1332991 - /axis/axis2/java/transports/trunk/pom.xml
Author: sagara Date: Wed May 2 11:04:57 2012 New Revision: 1332991 URL: http://svn.apache.org/viewvc?rev=1332991&view=rev Log: removed incorrect element. my bad :( Modified: axis/axis2/java/transports/trunk/pom.xml Modified: axis/axis2/java/transports/trunk/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/pom.xml?rev=1332991&r1=1332990&r2=1332991&view=diff == --- axis/axis2/java/transports/trunk/pom.xml (original) +++ axis/axis2/java/transports/trunk/pom.xml Wed May 2 11:04:57 2012 @@ -269,7 +269,6 @@ -
svn commit: r1333001 - /axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/JSONOMBuilderTest.java
Author: veithen Date: Wed May 2 11:35:29 2012 New Revision: 1333001 URL: http://svn.apache.org/viewvc?rev=1333001&view=rev Log: If the tests are expected to test badgerfish, then they should use the corresponding message builder... Modified: axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/JSONOMBuilderTest.java Modified: axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/JSONOMBuilderTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/JSONOMBuilderTest.java?rev=1333001&r1=1333000&r2=1333001&view=diff == --- axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/JSONOMBuilderTest.java (original) +++ axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/JSONOMBuilderTest.java Wed May 2 11:35:29 2012 @@ -63,7 +63,7 @@ public class JSONOMBuilderTest extends T ByteArrayInputStream inStream = new ByteArrayInputStream(jsonString.getBytes()); MessageContext msgCtx = new MessageContext(); -JSONOMBuilder omBuilder = new JSONOMBuilder(); +Builder omBuilder = new JSONBadgerfishOMBuilder(); OMElement elem = omBuilder.processDocument(inStream, JSONTestConstants.CONTENT_TYPE_BADGERFISH, msgCtx); @@ -91,7 +91,7 @@ public class JSONOMBuilderTest extends T ByteArrayInputStream inStream = new ByteArrayInputStream(jsonString.getBytes()); MessageContext msgCtx = new MessageContext(); -JSONOMBuilder omBuilder = new JSONOMBuilder(); +Builder omBuilder = new JSONBadgerfishOMBuilder(); OMElement elem = omBuilder.processDocument(inStream, JSONTestConstants.CONTENT_TYPE_BADGERFISH, msgCtx);
svn commit: r1333004 - in /axis/axis2/java/core/trunk/modules/json: src/org/apache/axis2/json/ test-repository/services/POJOService.aar/META-INF/ test/org/apache/axis2/json/
Author: veithen
Date: Wed May 2 11:40:46 2012
New Revision: 1333004
URL: http://svn.apache.org/viewvc?rev=1333004&view=rev
Log:
Added (real) support for mapped JSON. Mapped JSON can now be used with standard
data bindings, including POJOs.
Note that there is still an exception thrown in MessageContext#isFault, but the
method actually drops the exception silently. Therefore this is not a
functional issue, but may be a performance issue.
Added:
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/JSONUtil.java
(with props)
Modified:
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/AbstractJSONDataSource.java
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/AbstractJSONMessageFormatter.java
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/AbstractJSONOMBuilder.java
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/JSONBadgerfishMessageFormatter.java
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/JSONBadgerfishOMBuilder.java
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/JSONDataSource.java
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/JSONMessageFormatter.java
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/JSONOMBuilder.java
axis/axis2/java/core/trunk/modules/json/test-repository/services/POJOService.aar/META-INF/services.xml
axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/JSONDataSourceTest.java
axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/JSONIntegrationTest.java
Modified:
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/AbstractJSONDataSource.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/AbstractJSONDataSource.java?rev=1333004&r1=1333003&r2=1333004&view=diff
==
---
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/AbstractJSONDataSource.java
(original)
+++
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/AbstractJSONDataSource.java
Wed May 2 11:40:46 2012
@@ -50,7 +50,7 @@ public abstract class AbstractJSONDataSo
return getXMLInputFactory().createXMLStreamReader(new
JSONTokener(getJSONString()));
}
-protected abstract AbstractXMLInputFactory getXMLInputFactory();
+protected abstract AbstractXMLInputFactory getXMLInputFactory() throws
XMLStreamException;
public boolean isDestructiveRead() {
// TODO: for the moment the data source in not destructive (because it
reads the entire message into memory before processing it), but this will
change...
Modified:
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/AbstractJSONMessageFormatter.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/AbstractJSONMessageFormatter.java?rev=1333004&r1=1333003&r2=1333004&view=diff
==
---
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/AbstractJSONMessageFormatter.java
(original)
+++
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/AbstractJSONMessageFormatter.java
Wed May 2 11:40:46 2012
@@ -102,7 +102,7 @@ public abstract class AbstractJSONMessag
} else {
try {
ByteArrayOutputStream bytesOut = new ByteArrayOutputStream();
-XMLStreamWriter jsonWriter = getJSONWriter(bytesOut, format);
+XMLStreamWriter jsonWriter = getJSONWriter(bytesOut, format,
msgCtxt);
element.serializeAndConsume(jsonWriter);
jsonWriter.writeEndDocument();
@@ -126,17 +126,17 @@ public abstract class AbstractJSONMessag
return null;
}
-private XMLStreamWriter getJSONWriter(OutputStream outStream,
OMOutputFormat format)
-throws AxisFault {
+private XMLStreamWriter getJSONWriter(OutputStream outStream,
OMOutputFormat format, MessageContext messageContext)
+throws AxisFault, XMLStreamException {
try {
-return getJSONWriter(new OutputStreamWriter(outStream,
format.getCharSetEncoding()));
+return getJSONWriter(new OutputStreamWriter(outStream,
format.getCharSetEncoding()), messageContext);
} catch (UnsupportedEncodingException ex) {
throw AxisFault.makeFault(ex);
}
}
//returns the "Mapped" JSON writer
-protected abstract XMLStreamWriter getJSONWriter(Writer writer);
+protected abstract XMLStreamWriter getJSONWriter(Writer writer,
MessageContext messageContext) throws XMLStreamException;
/**
* Get the original JSON string from the given element if it is available
and if the element has
@@ -184,7 +184,7 @@ public abstract class
svn commit: r1333017 - in /axis/axis2/java/core/trunk/modules: codegen/src/org/apache/axis2/wsdl/ codegen/src/org/apache/axis2/wsdl/i18n/ codegen/src/org/apache/axis2/wsdl/util/ kernel/src/org/apache/
Author: sagara
Date: Wed May 2 12:41:56 2012
New Revision: 1333017
URL: http://svn.apache.org/viewvc?rev=1333017&view=rev
Log:
Fixed AXIS2-5311 - Now WSDL2JAVA support for Java system properties through -D
option.
Modified:
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/WSDL2Code.java
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/i18n/resource.properties
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/util/WSDL2JavaOptionsValidator.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/CommandLineOptionConstants.java
Modified:
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/WSDL2Code.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/WSDL2Code.java?rev=1333017&r1=1333016&r2=1333017&view=diff
==
---
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/WSDL2Code.java
(original)
+++
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/WSDL2Code.java
Wed May 2 12:41:56 2012
@@ -40,6 +40,7 @@ public class WSDL2Code {
CommandLineOptionParser commandLineOptionParser = new
CommandLineOptionParser(
args);
checkAuthentication(commandLineOptionParser);
+ setSystemProperties(commandLineOptionParser);
//If it is a JAX-WS code generation request call WSimportTool.
if (isJwsOptionEnabled(commandLineOptionParser)){
new JAXWSCodeGenerationEngine(commandLineOptionParser,
args).generate();
@@ -56,7 +57,7 @@ public class WSDL2Code {
System.out.println(CodegenMessages.getMessage("wsdl2code.arg"));
System.out.println(CodegenMessages.getMessage("wsdl2code.arg1"));
-for (int i = 2; i <= 52; i++) {
+for (int i = 2; i <= 53; i++) {
System.out.println(" " +
CodegenMessages.getMessage("wsdl2code.arg" + i));
}
}
@@ -140,5 +141,25 @@ public class WSDL2Code {
});
}
}
+
+private static void setSystemProperties(CommandLineOptionParser
commandLineOptionParser) {
+Map allOptions =
commandLineOptionParser.getAllOptions();
+// System properties follow "-Dproperty=value" format, only key is
required.
+if (allOptions != null) {
+for (String key : allOptions.keySet()) {
+if (key != null
+&& key.length() > 0
+&&
key.startsWith(CommandLineOptionConstants.WSDL2JavaConstants.SYSTEM_PROPERTY_PREFIX)
+&& key.contains("=")) {
+int splitIndex = key.indexOf("=");
+String pKey = key.substring(1, splitIndex);
+String pValue = key.substring(splitIndex + 1);
+if (pKey != null && pValue != null) {
+System.setProperty(pKey, pValue);
+}
+}
+}
+}
+}
}
Modified:
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/i18n/resource.properties
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/i18n/resource.properties?rev=1333017&r1=1333016&r2=1333017&view=diff
==
---
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/i18n/resource.properties
(original)
+++
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/i18n/resource.properties
Wed May 2 12:41:56 2012
@@ -86,7 +86,8 @@ wsdl2code.arg48= -sin
wsdl2code.arg49= -scn Skeleton class name - used to
specify a name for skeleton class other than the default one
wsdl2code.arg50= -oaa -change the absolute http
addresses to local file addresses generated by wsdl2java tool
wsdl2code.arg51= -ebc -generated Exceptions are
inherited from this exception rather than the java.lang.Exception class
-wsdl2code.arg52= -uon -by default the first letter of
the generated method name changeed to lowercase. This option stops that and
make it same as operation name
+wsdl2code.arg52= -uon -by default the first letter of
the generated method name changeed to lowercase. This option stops that and
make it same as operation name
+wsdl2code.arg53= -D= -Java system properties
## prop file loader #
propfileload.frameworkMismatch=Number of frameworks and extension names do not
match!
Modified:
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/util/WSDL2JavaOptionsValidator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/util/WSDL2JavaOptionsValidator.java?rev=1333017&r1=1333016&r2=1333017&view=diff
===
svn commit: r1333160 - in /axis/axis2/java/sandesha/branches/1_4: ./ modules/distribution/src/main/assembly/src.xml
Author: veithen Date: Wed May 2 19:22:37 2012 New Revision: 1333160 URL: http://svn.apache.org/viewvc?rev=1333160&view=rev Log: Merged r1332067 to the 1.4 branch. Modified: axis/axis2/java/sandesha/branches/1_4/ (props changed) axis/axis2/java/sandesha/branches/1_4/modules/distribution/src/main/assembly/src.xml Propchange: axis/axis2/java/sandesha/branches/1_4/ -- Merged /axis/axis2/java/sandesha/trunk:r1332067 Modified: axis/axis2/java/sandesha/branches/1_4/modules/distribution/src/main/assembly/src.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/modules/distribution/src/main/assembly/src.xml?rev=1333160&r1=1333159&r2=1333160&view=diff == --- axis/axis2/java/sandesha/branches/1_4/modules/distribution/src/main/assembly/src.xml (original) +++ axis/axis2/java/sandesha/branches/1_4/modules/distribution/src/main/assembly/src.xml Wed May 2 19:22:37 2012 @@ -31,7 +31,7 @@ config/**/* modules/**/* -xdocs/**/* +src/**/* **/pom.xml
svn commit: r1333204 - in /axis/axis2/java/core/trunk/modules/json: src/org/apache/axis2/json/JSONUtil.java test-repository/services/POJOService.aar/META-INF/services.xml
Author: veithen
Date: Wed May 2 20:58:38 2012
New Revision: 1333204
URL: http://svn.apache.org/viewvc?rev=1333204&view=rev
Log:
Slightly changed the syntax of the service parameter that defines the XML to
JSON namespace mappings (introduced in r1333004).
Modified:
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/JSONUtil.java
axis/axis2/java/core/trunk/modules/json/test-repository/services/POJOService.aar/META-INF/services.xml
Modified:
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/JSONUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/JSONUtil.java?rev=1333204&r1=1333203&r2=1333204&view=diff
==
---
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/JSONUtil.java
(original)
+++
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/JSONUtil.java
Wed May 2 20:58:38 2012
@@ -33,12 +33,12 @@ public final class JSONUtil {
public static Map getNS2JNSMap(AxisService service) {
Map ns2jnsMap = new HashMap();
-Parameter param = service.getParameter("JSONNamespaceMap");
+Parameter param = service.getParameter("xmlToJsonNamespaceMap");
if (param != null) {
for (Iterator it =
param.getParameterElement().getChildrenWithName(new QName("mapping"));
it.hasNext(); ) {
OMElement mapping = (OMElement)it.next();
-ns2jnsMap.put(mapping.getAttributeValue(new QName("uri")),
- mapping.getAttributeValue(new QName("prefix")));
+ns2jnsMap.put(mapping.getAttributeValue(new
QName("xmlNamespace")),
+ mapping.getAttributeValue(new
QName("jsonNamespace")));
}
} else {
// If no namespace map is defined, use a default map compatible
with earlier Axis2 versions
Modified:
axis/axis2/java/core/trunk/modules/json/test-repository/services/POJOService.aar/META-INF/services.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/test-repository/services/POJOService.aar/META-INF/services.xml?rev=1333204&r1=1333203&r2=1333204&view=diff
==
---
axis/axis2/java/core/trunk/modules/json/test-repository/services/POJOService.aar/META-INF/services.xml
(original)
+++
axis/axis2/java/core/trunk/modules/json/test-repository/services/POJOService.aar/META-INF/services.xml
Wed May 2 20:58:38 2012
@@ -25,7 +25,7 @@
http://www.w3.org/2004/08/wsdl/in-out";
class="org.apache.axis2.rpc.receivers.RPCMessageReceiver"/>
org.apache.axis2.json.POJOService
-
-http://example.org"; prefix=""/>
+
+http://example.org"; jsonNamespace=""/>
\ No newline at end of file
