svn commit: r1242238 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java

2012-02-09 Thread sagara 
Author: sagara
Date: Thu Feb  9 08:48:32 2012
New Revision: 1242238

URL: http://svn.apache.org/viewvc?rev=1242238&view=rev
Log:
Fixed AXIS2-5243.

Modified:

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

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=1242238&r1=1242237&r2=1242238&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
 Thu Feb  9 08:48:32 2012
@@ -687,6 +687,14 @@ public class DefaultSchemaGenerator impl
 try {
 Field field = 
javaType.getDeclaredField(propertyName);
 genericFieldType = field.getGenericType();
+} catch (NoSuchFieldException e) {
+// We have to check setter/getter too.
+String getMethodName = "get" + 
propertyName.substring(0, 1).toUpperCase();
+if (propertyName.length() > 1) {
+getMethodName = getMethodName + 
propertyName.substring(1);
+}
+genericFieldType = javaType.getMethod(
+getMethodName, 
null).getGenericReturnType();
 } catch (Exception e) {
 //log.info(e.getMessage());
 }

svn commit: r1242242 - in /axis/axis2/java/core/branches/1_6: ./ modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java

2012-02-09 Thread sagara 
Author: sagara
Date: Thu Feb  9 08:53:19 2012
New Revision: 1242242

URL: http://svn.apache.org/viewvc?rev=1242242&view=rev
Log:
Merged r1242238 to the 1.6 branch.

Modified:
axis/axis2/java/core/branches/1_6/   (props changed)

axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java

Propchange: axis/axis2/java/core/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  9 08:53:19 2012
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1163389,1166038,1166040,1166132,1167045,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1205716,1205939,1208901,1209034,1213639,1
 214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031
+/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1163389,1166038,1166040,1166132,1167045,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1205716,1205939,1208901,1209034,1213639,1
 214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238

Modified: 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java?rev=1242242&r1=1242241&r2=1242242&view=diff
==
--- 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
 Thu Feb  9 08:53:19 2012
@@ -607,6 +607,14 @@ public class DefaultSchemaGenerator impl
 try {
 Field field = 
javaType.getDeclaredField(propertyName);
 genericFieldType = field.getGenericType();
+} catch (NoSuchFieldException e) {
+// We have to check setter/getter too.
+String getMethodName = "get" + 
propertyName.substring(0, 1).toUpperCase();
+if (propertyName.length() > 1) {
+getMethodName = getMethodName + 
propertyName.substring(1);
+}
+genericFieldType = javaType.getMethod(
+getMethodName, 
null).getGenericReturnType();
 } catch (Exception e) {
 //log.info(e.getMessage());
 }

svn commit: r1242249 - /axis/axis2/java/core/trunk/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java

2012-02-09 Thread sagara 
Author: sagara
Date: Thu Feb  9 09:18:40 2012
New Revision: 1242249

URL: http://svn.apache.org/viewvc?rev=1242249&view=rev
Log:
Fixed AXIS2-5241.

Modified:

axis/axis2/java/core/trunk/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java

Modified: 
axis/axis2/java/core/trunk/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java?rev=1242249&r1=1242248&r2=1242249&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java
 Thu Feb  9 09:18:40 2012
@@ -128,7 +128,7 @@ public class Java2WSDLMojo extends Abstr
 
 /**
  * Schema Generator
- * @parameter expression="${axis2.java2wsdl.nsGenClassName}"
+ * @parameter expression="${axis2.java2wsdl.schemaGenClassName}"
  */
 private String schemaGenClassName;

svn commit: r1242252 - in /axis/axis2/java/core/branches/1_6: ./ modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java

2012-02-09 Thread sagara 
Author: sagara
Date: Thu Feb  9 09:21:14 2012
New Revision: 1242252

URL: http://svn.apache.org/viewvc?rev=1242252&view=rev
Log:
Merged r1242249 to the 1.6 branch.

Modified:
axis/axis2/java/core/branches/1_6/   (props changed)

axis/axis2/java/core/branches/1_6/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java

Propchange: axis/axis2/java/core/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  9 09:21:14 2012
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1163389,1166038,1166040,1166132,1167045,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1205716,1205939,1208901,1209034,1213639,1
 214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238
+/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1163389,1166038,1166040,1166132,1167045,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1205716,1205939,1208901,1209034,1213639,1
 
214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249

Modified: 
axis/axis2/java/core/branches/1_6/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java?rev=1242252&r1=1242251&r2=1242252&view=diff
==
--- 
axis/axis2/java/core/branches/1_6/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java
 Thu Feb  9 09:21:14 2012
@@ -128,7 +128,7 @@ public class Java2WSDLMojo extends Abstr
 
 /**
  * Schema Generator
- * @parameter expression="${axis2.java2wsdl.nsGenClassName}"
+ * @parameter expression="${axis2.java2wsdl.schemaGenClassName}"
  */
 private String schemaGenClassName;

svn commit: r1242489 - in /axis/axis1/java/trunk: ./ axis-jms/ samples/ samples/attachments-sample/ samples/bidbuy-sample/ samples/echo-sample/ samples/encoding-sample/ samples/faults-sample/ samples/

2012-02-09 Thread veithen 
Author: veithen
Date: Thu Feb  9 19:52:11 2012
New Revision: 1242489

URL: http://svn.apache.org/viewvc?rev=1242489&view=rev
Log:
Set svn:ignore.

Modified:
axis/axis1/java/trunk/   (props changed)
axis/axis1/java/trunk/axis-jms/   (props changed)
axis/axis1/java/trunk/samples/   (props changed)
axis/axis1/java/trunk/samples/attachments-sample/   (props changed)
axis/axis1/java/trunk/samples/bidbuy-sample/   (props changed)
axis/axis1/java/trunk/samples/echo-sample/   (props changed)
axis/axis1/java/trunk/samples/encoding-sample/   (props changed)
axis/axis1/java/trunk/samples/faults-sample/   (props changed)
axis/axis1/java/trunk/samples/handler-sample/   (props changed)
axis/axis1/java/trunk/samples/message-sample/   (props changed)
axis/axis1/java/trunk/samples/misc-sample/   (props changed)
axis/axis1/java/trunk/samples/proxy-sample/   (props changed)
axis/axis1/java/trunk/samples/stock-sample/   (props changed)
axis/axis1/java/trunk/samples/transport-sample/   (props changed)

Propchange: axis/axis1/java/trunk/
--
--- svn:ignore (original)
+++ svn:ignore Thu Feb  9 19:52:11 2012
@@ -15,3 +15,4 @@ GetQuote.wsdl
 axis_coverage*
 build.properties
 axis-1_2*
+target

Propchange: axis/axis1/java/trunk/axis-jms/
--
--- svn:ignore (added)
+++ svn:ignore Thu Feb  9 19:52:11 2012
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings

Propchange: axis/axis1/java/trunk/samples/
--
--- svn:ignore (added)
+++ svn:ignore Thu Feb  9 19:52:11 2012
@@ -0,0 +1 @@
+target

Propchange: axis/axis1/java/trunk/samples/attachments-sample/
--
--- svn:ignore (added)
+++ svn:ignore Thu Feb  9 19:52:11 2012
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings

Propchange: axis/axis1/java/trunk/samples/bidbuy-sample/
--
--- svn:ignore (added)
+++ svn:ignore Thu Feb  9 19:52:11 2012
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings

Propchange: axis/axis1/java/trunk/samples/echo-sample/
--
--- svn:ignore (added)
+++ svn:ignore Thu Feb  9 19:52:11 2012
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings

Propchange: axis/axis1/java/trunk/samples/encoding-sample/
--
--- svn:ignore (added)
+++ svn:ignore Thu Feb  9 19:52:11 2012
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings

Propchange: axis/axis1/java/trunk/samples/faults-sample/
--
--- svn:ignore (added)
+++ svn:ignore Thu Feb  9 19:52:11 2012
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings

Propchange: axis/axis1/java/trunk/samples/handler-sample/
--
--- svn:ignore (added)
+++ svn:ignore Thu Feb  9 19:52:11 2012
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings

Propchange: axis/axis1/java/trunk/samples/message-sample/
--
--- svn:ignore (added)
+++ svn:ignore Thu Feb  9 19:52:11 2012
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings

Propchange: axis/axis1/java/trunk/samples/misc-sample/
--
--- svn:ignore (added)
+++ svn:ignore Thu Feb  9 19:52:11 2012
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings

Propchange: axis/axis1/java/trunk/samples/proxy-sample/
--
--- svn:ignore (added)
+++ svn:ignore Thu Feb  9 19:52:11 2012
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings

Propchange: axis/axis1/java/trunk/samples/stock-sample/
--
--- svn:ignore (added)
+++ svn:ignore Thu Feb  9 19:52:11 2012
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings

Propchange: axis/axis1/java/trunk/samples/transport-sample/
--
--- svn:ignore (added)
+++ svn:ignore Thu Feb  9 19:52:11 2012
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings

svn commit: r1242511 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java

2012-02-09 Thread veithen 
Author: veithen
Date: Thu Feb  9 20:36:12 2012
New Revision: 1242511

URL: http://svn.apache.org/viewvc?rev=1242511&view=rev
Log:
Proper fix for AXIS2-5243.

Modified:

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

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=1242511&r1=1242510&r2=1242511&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
 Thu Feb  9 20:36:12 2012
@@ -683,22 +683,7 @@ public class DefaultSchemaGenerator impl
 String propertyName = property.getName();
 if (!property.getName().equals("class") && 
(property.getPropertyType() != null)) {
 if ((beanExcludeInfo == null) || 
!beanExcludeInfo.isExcludedProperty(propertyName)) {
-Type genericFieldType = null;
-try {
-Field field = 
javaType.getDeclaredField(propertyName);
-genericFieldType = field.getGenericType();
-} catch (NoSuchFieldException e) {
-// We have to check setter/getter too.
-String getMethodName = "get" + 
propertyName.substring(0, 1).toUpperCase();
-if (propertyName.length() > 1) {
-getMethodName = getMethodName + 
propertyName.substring(1);
-}
-genericFieldType = javaType.getMethod(
-getMethodName, 
null).getGenericReturnType();
-} catch (Exception e) {
-//log.info(e.getMessage());
-}
-
+Type genericFieldType = 
property.getReadMethod().getGenericReturnType();
 if(genericFieldType instanceof ParameterizedType){
 ParameterizedType aType = (ParameterizedType) 
genericFieldType;
 Type[] fieldArgTypes = 
aType.getActualTypeArguments();

svn commit: r1242521 - in /axis/axis1/java/trunk: ./ axis-maven-plugin/ integration/ maven/ maven/maven-axis-server-plugin/ maven/maven-axis-server-plugin/src/ maven/maven-axis-server-plugin/src/main/

2012-02-09 Thread veithen 
Author: veithen
Date: Thu Feb  9 20:53:02 2012
New Revision: 1242521

URL: http://svn.apache.org/viewvc?rev=1242521&view=rev
Log:
Split axis-maven-plugin into two distinct plugins.

Added:
axis/axis1/java/trunk/maven/
axis/axis1/java/trunk/maven/maven-axis-server-plugin/
axis/axis1/java/trunk/maven/maven-axis-server-plugin/pom.xml   (with props)
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/

axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/

axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/

axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/

axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/AbstractServerMojo.java
  - copied, changed from r1242481, 
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/AbstractServerMojo.java

axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/DefaultServerManager.java
  - copied unchanged from r1242481, 
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/DefaultServerManager.java

axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/FileSet.java
  - copied unchanged from r1242481, 
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/FileSet.java

axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/Server.java
  - copied unchanged from r1242481, 
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/Server.java

axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/ServerManager.java
  - copied unchanged from r1242481, 
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/ServerManager.java

axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/StartServerMojo.java
  - copied unchanged from r1242481, 
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/StartServerMojo.java

axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/StopServerMojo.java
  - copied unchanged from r1242481, 
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/StopServerMojo.java

axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/StreamPump.java
  - copied unchanged from r1242481, 
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/StreamPump.java
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/resources/
  - copied from r1242481, 
axis/axis1/java/trunk/axis-maven-plugin/src/main/resources/
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/pom.xml   (with props)
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/

axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/

axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/maven/

axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/maven/AbstractWsdl2JavaMojo.java
  - copied, changed from r1242481, 
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/AbstractWsdl2JavaMojo.java

axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/maven/Mapping.java
  - copied unchanged from r1242481, 
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/Mapping.java

axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/maven/Wsdl2JavaMojo.java
  - copied unchanged from r1242481, 
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/Wsdl2JavaMojo.java

axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/maven/Wsdl2JavaTestMojo.java
  - copied unchanged from r1242481, 
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/Wsdl2JavaTestMojo.java
axis/axis1/java/trunk/maven/pom.xml   (with props)
Removed:
axis/axis1/java/trunk/axis-maven-plugin/
Modified:
axis/axis1/java/trunk/integration/pom.xml
axis/axis1/java/trunk/pom.xml
axis/axis1/java/trunk/samples/attachments-sample/pom.xml
axis/axis1

svn commit: r1242550 - in /axis/axis2/java/core/branches/1_6: ./ modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java

2012-02-09 Thread veithen 
Author: veithen
Date: Thu Feb  9 21:58:28 2012
New Revision: 1242550

URL: http://svn.apache.org/viewvc?rev=1242550&view=rev
Log:
AXIS2-5243: Merged r1242511 to the 1.6 branch.

Modified:
axis/axis2/java/core/branches/1_6/   (props changed)

axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java

Propchange: axis/axis2/java/core/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  9 21:58:28 2012
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1163389,1166038,1166040,1166132,1167045,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1205716,1205939,1208901,1209034,1213639,1
 
214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249
+/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1163389,1166038,1166040,1166132,1167045,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1205716,1205939,1208901,1209034,1213639,1
 
214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511

Modified: 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java?rev=1242550&r1=1242549&r2=1242550&view=diff
==
--- 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
 Thu Feb  9 21:58:28 2012
@@ -603,22 +603,7 @@ public class DefaultSchemaGenerator impl
 String propertyName = property.getName();
 if (!property.getName().equals("class") && 
(property.getPropertyType() != null)) {
 if ((beanExcludeInfo == null) || 
!beanExcludeInfo.isExcludedProperty(propertyName)) {
-Type genericFieldType = null;
-try {
-Field field = 
javaType.getDeclaredField(propertyName);
-genericFieldType = field.getGenericType();
-} catch (NoSuchFieldException e) {
-// We have to check setter/getter too.
-String getMethodName = "get" + 
propertyName.substring(0, 1).toUpperCase();
-if (propertyName.length() > 1) {
-getMethodName = getMethodName + 
propertyName.substring(1);
-}
-genericFieldType = javaType.getMethod(
-getMethodName, 
null).getGenericReturnType();
-} catch (Exception e) {
-//log.info(e.getMessage());
-}
-
+Type genericFieldType = 
property.getReadMethod().getGenericReturnType();
 if(genericFieldType instanceof ParameterizedType){
 ParameterizedType aType = (ParameterizedType) 
genericFieldType;

svn commit: r1242566 - in /axis/axis1/java/trunk: maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/ samples/attachments-sample/ samples/attachments-sample/src/test/java/test/function

2012-02-09 Thread veithen 
Author: veithen
Date: Thu Feb  9 22:27:18 2012
New Revision: 1242566

URL: http://svn.apache.org/viewvc?rev=1242566&view=rev
Log:
Process deployments/undeployments using maven-axis-server-plugin instead of 
executing AdminClient from within the unit tests.

Modified:

axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/DefaultServerManager.java

axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/Server.java

axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/ServerManager.java

axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/StartServerMojo.java
axis/axis1/java/trunk/samples/attachments-sample/pom.xml

axis/axis1/java/trunk/samples/attachments-sample/src/test/java/test/functional/TestAttachmentsSample.java

Modified: 
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/DefaultServerManager.java
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/DefaultServerManager.java?rev=1242566&r1=1242565&r2=1242566&view=diff
==
--- 
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/DefaultServerManager.java
 (original)
+++ 
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/DefaultServerManager.java
 Thu Feb  9 22:27:18 2012
@@ -44,7 +44,21 @@ public class DefaultServerManager implem
 this.logger = logger;
 }
 
-public void startServer(String jvm, String[] classpath, int port, String[] 
vmArgs, File workDir, String[] wsddFiles, File[] jwsDirs, int timeout) throws 
Exception {
+private void process(AdminClient adminClient, File[] wsddFiles) throws 
Exception {
+for (int i=0; ihttp://localhost:"; + 
port + "/axis/services/AdminService"));
 List cmdline = new ArrayList();
@@ -65,7 +79,7 @@ public class DefaultServerManager implem
 logger.debug("Starting process with command line: " + cmdline);
 }
 Process process = 
Runtime.getRuntime().exec((String[])cmdline.toArray(new 
String[cmdline.size()]), null, workDir);
-servers.put(Integer.valueOf(port), new Server(process, adminClient));
+servers.put(Integer.valueOf(port), new Server(process, adminClient, 
undeployments));
 new Thread(new StreamPump(process.getInputStream(), System.out), 
"axis-server-" + port + "-stdout").start();
 new Thread(new StreamPump(process.getErrorStream(), System.err), 
"axis-server-" + port + "-stderr").start();
 
@@ -95,24 +109,14 @@ public class DefaultServerManager implem
 }
 
 // Deploy services
-if (wsddFiles != null) {
-for (int i=0; ihttp://svn.apache.org/viewvc/axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/Server.java?rev=1242566&r1=1242565&r2=1242566&view=diff
==
--- 
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/Server.java
 (original)
+++ 
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/Server.java
 Thu Feb  9 22:27:18 2012
@@ -18,15 +18,19 @@
  */
 package org.apache.axis.maven;
 
+import java.io.File;
+
 import org.apache.axis.client.AdminClient;
 
 public class Server {
 private final Process process;
 private final AdminClient adminClient;
+private final File[] undeployments;
 
-public Server(Process process, AdminClient adminClient) {
+public Server(Process process, AdminClient adminClient, File[] 
undeployments) {
 this.process = process;
 this.adminClient = adminClient;
+this.undeployments = undeployments;
 }
 
 public Process getProcess() {
@@ -36,4 +40,8 @@ public class Server {
 public AdminClient getAdminClient() {
 return adminClient;
 }
+
+public File[] getUndeployments() {
+return undeployments;
+}
 }

Modified: 
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/ServerManager.java
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/ServerManager.java?rev=1242566&r1=1242565&r2=1242566&view=diff
==
--- 
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/ServerManager.java
 (original)
+++ 
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/ServerManager.java
 Thu Feb  9 22:27:18 2012
@@ -21,6 +21,6 @@ package org.apache.axis.maven;
 import java.io.File;
 
 public interface ServerManager {
-void startServer