svn commit: r1053581 - in /axis/axis2/java/core/trunk/modules: kernel/src/org/apache/axis2/JAXRS/ kernel/src/org/apache/axis2/deployment/util/ kernel/src/org/apache/axis2/description/java2wsdl/ kernel

2010-12-29 Thread azeez 
Author: azeez
Date: Wed Dec 29 09:32:29 2010
New Revision: 1053581

URL: http://svn.apache.org/viewvc?rev=1053581&view=rev
Log:
1. Fix AXIS2-2944
2. s/JAXRS/jaxrs according the standard Java package naming conventions


Added:

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/java/security/SSLProtocolSocketFactory.java

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/java/security/TrustAllTrustManager.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jaxrs/
  - copied from r1051884, 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/JAXRS/
Removed:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/JAXRS/
Modified:

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jaxrs/JAXRSModel.java

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jaxrs/JAXRSUtils.java
axis/axis2/java/core/trunk/modules/osgi/pom.xml

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java?rev=1053581&r1=1053580&r2=1053581&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
 Wed Dec 29 09:32:29 2010
@@ -27,7 +27,7 @@ import org.apache.axiom.soap.SOAP12Const
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.classloader.JarFileClassLoader;
 import org.apache.axis2.Constants;
-import org.apache.axis2.JAXRS.JAXRSModel;
+import org.apache.axis2.jaxrs.JAXRSModel;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.deployment.DeploymentClassLoader;
 import org.apache.axis2.deployment.DeploymentConstants;

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java?rev=1053581&r1=1053580&r2=1053581&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
 Wed Dec 29 09:32:29 2010
@@ -20,8 +20,8 @@
 package org.apache.axis2.description.java2wsdl;
 
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.JAXRS.JAXRSUtils;
-import org.apache.axis2.JAXRS.JAXRSModel;
+import org.apache.axis2.jaxrs.JAXRSUtils;
+import org.apache.axis2.jaxrs.JAXRSModel;
 import org.apache.axis2.util.JavaUtils;
 import org.apache.axis2.deployment.util.BeanExcludeInfo;
 import org.apache.axis2.deployment.util.Utils;

Added: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/java/security/SSLProtocolSocketFactory.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/java/security/SSLProtocolSocketFactory.java?rev=1053581&view=auto
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/java/security/SSLProtocolSocketFactory.java
 (added)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/java/security/SSLProtocolSocketFactory.java
 Wed Dec 29 09:32:29 2010
@@ -0,0 +1,82 @@
+/* 
+ * Copyright 2004,2005 The Apache Software Foundation. 
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at 
+ * 
+ *  http://www.apache.org/licenses/LICENSE-2.0 
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS,   
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.

svn commit: r1053623 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java

2010-12-29 Thread azeez 
Author: azeez
Date: Wed Dec 29 12:03:11 2010
New Revision: 1053623

URL: http://svn.apache.org/viewvc?rev=1053623&view=rev
Log:
introduced constant


Modified:

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=1053623&r1=1053622&r2=1053623&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
 Wed Dec 29 12:03:11 2010
@@ -80,6 +80,8 @@ public abstract class DeploymentEngine i
  */
 public static final String  DEPLOYMENT_TASK_RUNNING = 
"deployment.task.running";
 
+private static final String MODULE_DEPLOYER = "moduleDeployer";
+
 //to keep the web resource location if any
 protected static String webLocationString = null;
 protected Scheduler scheduler;
@@ -1185,7 +1187,6 @@ public abstract class DeploymentEngine i
 public static AxisModule buildModule(File modulearchive,
  AxisConfiguration config)
 throws DeploymentException {
-final String MODULE_DEPLOYER = "moduleDeployer";
 AxisModule axismodule;
 ModuleDeployer deployer = (ModuleDeployer) 
config.getParameterValue(MODULE_DEPLOYER);
 try {

svn commit: r1053718 - in /axis/axis2/java/core/trunk/modules: jaxws-integration/test/server/ kernel/src/org/apache/axis2/builder/ xmlbeans/src/org/apache/axis2/xmlbeans/template/

2010-12-29 Thread veithen 
Author: veithen
Date: Wed Dec 29 19:44:39 2010
New Revision: 1053718

URL: http://svn.apache.org/viewvc?rev=1053718&view=rev
Log:
Used the new API introduced by AXIOM-313 to eliminate references to 
org.apache.axiom.om.impl.OMNodeEx, which is considered as an internal API.

Modified:

axis/axis2/java/core/trunk/modules/jaxws-integration/test/server/EchoServiceMessageReceiverInOut.java

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/ApplicationXMLBuilder.java

axis/axis2/java/core/trunk/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl

Modified: 
axis/axis2/java/core/trunk/modules/jaxws-integration/test/server/EchoServiceMessageReceiverInOut.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test/server/EchoServiceMessageReceiverInOut.java?rev=1053718&r1=1053717&r2=1053718&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/jaxws-integration/test/server/EchoServiceMessageReceiverInOut.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws-integration/test/server/EchoServiceMessageReceiverInOut.java
 Wed Dec 29 19:44:39 2010
@@ -93,8 +93,7 @@
= new 
org.apache.axiom.om.impl.builder.StAXOMBuilder
 
(org.apache.axiom.om.OMAbstractFactory.getOMFactory(),
new 
org.apache.axis2.util.StreamWrapper(param.getPullParser(server.EchoString.MY_QNAME)));
-org.apache.axiom.om.OMElement documentElement = 
builder.getDocumentElement();
-((org.apache.axiom.om.impl.OMNodeEx) 
documentElement).setParent(null); // remove the parent link
+org.apache.axiom.om.OMElement documentElement = 
builder.getDocumentElement(true);
 return documentElement;
 }else{


Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/ApplicationXMLBuilder.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/ApplicationXMLBuilder.java?rev=1053718&r1=1053717&r2=1053718&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/ApplicationXMLBuilder.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/ApplicationXMLBuilder.java
 Wed Dec 29 19:44:39 2010
@@ -21,7 +21,6 @@ package org.apache.axis2.builder;
 
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.OMNodeEx;
 import org.apache.axiom.om.impl.builder.StAXBuilder;
 import org.apache.axiom.om.util.DetachableInputStream;
 import org.apache.axiom.soap.SOAPBody;
@@ -65,8 +64,7 @@ public class ApplicationXMLBuilder imple
 BuilderUtil.getPOXBuilder(pushbackInputStream,
 (String) messageContext.getProperty(
 
Constants.Configuration.CHARACTER_SET_ENCODING));
-OMNodeEx documentElement = (OMNodeEx) 
builder.getDocumentElement();
-documentElement.setParent(null);
+OMElement documentElement = 
builder.getDocumentElement(true);
 SOAPBody body = soapEnvelope.getBody();
 body.addChild(documentElement);
 }

Modified: 
axis/axis2/java/core/trunk/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl?rev=1053718&r1=1053717&r2=1053718&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl
 (original)
+++ 
axis/axis2/java/core/trunk/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl
 Wed Dec 29 19:44:39 2010
@@ -47,9 +47,8 @@
  if (optimizeContent) {
 org.apache.axiom.om.impl.builder.StAXOMBuilder builder 
= new org.apache.axiom.om.impl.builder.StAXOMBuilder
 
(org.apache.axiom.om.OMAbstractFactory.getOMFactory(),new 
org.apache.axis2.util.StreamWrapper(param.newXMLStreamReader())) ;
-org.apache.axiom.om.OMElement documentElement = 
builder.getDocumentElement();
+org.apache.axiom.om.OMElement documentElement = 
builder.getDocumentElement(true);
 optimizeContent(documentElement,qNameArray);
-
((org.apache.axiom.om.impl.OMNod