svn commit: r1377209 - in /axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl: GsonXMLStreamReader.java GsonXMLStreamWriter.java JSONMessageHandler.java

2012-08-24 Thread sagara
Author: sagara
Date: Sat Aug 25 04:41:04 2012
New Revision: 1377209

URL: http://svn.apache.org/viewvc?rev=1377209&view=rev
Log:
Fixed build failure. Please make sure to build using Java5 before submit 
patches. It's not hard to avoid these simple mistakes.  

Modified:

axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/GsonXMLStreamReader.java

axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/GsonXMLStreamWriter.java

axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JSONMessageHandler.java

Modified: 
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/GsonXMLStreamReader.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/GsonXMLStreamReader.java?rev=1377209&r1=1377208&r2=1377209&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/GsonXMLStreamReader.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/GsonXMLStreamReader.java
 Sat Aug 25 04:41:04 2012
@@ -136,12 +136,12 @@ public class GsonXMLStreamReader impleme
 isProcessed = true;
 }
 
-@Override
+
 public Object getProperty(String name) throws IllegalArgumentException {
 return null;
 }
 
-@Override
+
 public int next() throws XMLStreamException {
 if (hasNext()) {
 try {
@@ -155,22 +155,22 @@ public class GsonXMLStreamReader impleme
 }
 }
 
-@Override
+
 public void require(int type, String namespaceURI, String localName) 
throws XMLStreamException {
 throw new UnsupportedOperationException("Method is not implemented");
 }
 
-@Override
+
 public String getElementText() throws XMLStreamException {
 throw new UnsupportedOperationException("Method is not implemented");
 }
 
-@Override
+
 public int nextTag() throws XMLStreamException {
 throw new UnsupportedOperationException("Method is not implemented");
 }
 
-@Override
+
 public boolean hasNext() throws XMLStreamException {
 try {
 tokenType = jsonReader.peek();
@@ -184,12 +184,12 @@ public class GsonXMLStreamReader impleme
 }
 }
 
-@Override
+
 public void close() throws XMLStreamException {
 throw new UnsupportedOperationException("Method is not implemented");
 }
 
-@Override
+
 public String getNamespaceURI(String prefix) {
 if (isStartElement() || isEndElement()) {
 return namespace;
@@ -198,7 +198,7 @@ public class GsonXMLStreamReader impleme
 }
 }
 
-@Override
+
 public boolean isStartElement() {
 if (state == JsonState.NameName
 || state == JsonState.NameValue
@@ -210,7 +210,7 @@ public class GsonXMLStreamReader impleme
 }
 }
 
-@Override
+
 public boolean isEndElement() {
 if (state == JsonState.ValueValue_START
 || state == JsonState.EndArrayName
@@ -226,7 +226,7 @@ public class GsonXMLStreamReader impleme
 }
 }
 
-@Override
+
 public boolean isCharacters() {
 if (state == JsonState.ValueValue_END
 || state == JsonState.ValueEndArray
@@ -239,17 +239,17 @@ public class GsonXMLStreamReader impleme
 
 }
 
-@Override
+
 public boolean isWhiteSpace() {
 return false;
 }
 
-@Override
+
 public String getAttributeValue(String namespaceURI, String localName) {
 throw new UnsupportedOperationException("Method is not implemented");
 }
 
-@Override
+
 public int getAttributeCount() {
 if (isStartElement()) {
 return 0; // don't support attributes on tags  in JSON convention
@@ -258,42 +258,42 @@ public class GsonXMLStreamReader impleme
 }
 }
 
-@Override
+
 public QName getAttributeName(int index) {
 throw new UnsupportedOperationException("Method is not implemented");
 }
 
-@Override
+
 public String getAttributeNamespace(int index) {
 throw new UnsupportedOperationException("Method is not implemented");
 }
 
-@Override
+
 public String getAttributeLocalName(int index) {
 throw new UnsupportedOperationException("Method is not implemented");
 }
 
-@Override
+
 public String getAttributePrefix(int index) {
 throw new UnsupportedOperationException("Method is not implemented");
 }
 
-@Override
+
 public String getAttributeType(int index) {
 throw new UnsupportedOperationException("Method is not implemented");
 }
 
-@Override
+
 public String getAttributeValue(int index) {
 throw new UnsupportedOperationException("Method is not implemented");
 }
 
-@Override
+
 public boolean isAttributeSpecified(int index) {
 throw new UnsupportedOperationEx

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

2012-08-24 Thread sagara
Author: sagara
Date: Sat Aug 25 06:38:24 2012
New Revision: 1377221

URL: http://svn.apache.org/viewvc?rev=1377221&view=rev
Log:
Correction for AXIS2-5322.

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=1377221&r1=1377220&r2=1377221&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
 Sat Aug 25 06:38:24 2012
@@ -940,17 +940,17 @@ public abstract class DeploymentEngine i
 // init ServiceBuilderExtensions
 ServiceBuilderExtension builderExtension = 
sbeItr.next();
 builderExtension.init(configContext);
-((AbstractDeployer) 
deployer).addServiceBuilderExtensions(builderExtension);
-/*
- * URL based deployment does not fully based on 
standard
- * deployment architecture hence it's require to set
- * serviceDeployer variable. serviceDeployer variable
- * set only if the ServiceDeployer has been registered
- * on axis2.xml file.
- */
-if (deployer instanceof ServiceDeployer) {
-serviceDeployer = (ServiceDeployer) deployer;
-}
+((AbstractDeployer) 
deployer).addServiceBuilderExtensions(builderExtension);
+}
+/*
+ * URL based deployment does not fully based on standard
+ * deployment architecture hence it's require to set
+ * serviceDeployer variable. serviceDeployer variable
+ * set only if the ServiceDeployer has been registered
+ * on axis2.xml file.
+ */
+if (deployer instanceof ServiceDeployer) {
+serviceDeployer = (ServiceDeployer) deployer;
 }
 }
 }