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

2012-07-23 Thread sagara 
Author: sagara
Date: Mon Jul 23 07:10:53 2012
New Revision: 1364525

URL: http://svn.apache.org/viewvc?rev=1364525&view=rev
Log:
Andreas already fixed this on r1355084 in a different path, just added 
condition so that this won't make any future confusion among two classes.   

Modified:

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

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DocLitBareSchemaGenerator.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DocLitBareSchemaGenerator.java?rev=1364525&r1=1364524&r2=1364525&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DocLitBareSchemaGenerator.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DocLitBareSchemaGenerator.java
 Mon Jul 23 07:10:53 2012
@@ -73,7 +73,7 @@ public class DocLitBareSchemaGenerator e
 XmlSchemaSequence sequence;
 
 for (Method jMethod : declaredMethods) {
-if (jMethod.isBridge()) {
+if (jMethod.isBridge() || 
jMethod.getDeclaringClass().getName().equals(Object.class.getName())) {
 continue;
 }
 String methodName = jMethod.getName();

svn commit: r1364536 - in /axis/axis2/java/core/trunk/modules/tool: axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AbstractAarMojo.java axis2-mar-maven-plugin/src/main/java/org/apach

2012-07-23 Thread sagara 
Author: sagara
Date: Mon Jul 23 07:53:50 2012
New Revision: 1364536

URL: http://svn.apache.org/viewvc?rev=1364536&view=rev
Log:
Applied patch for AXIS2-5350.

Modified:

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

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

Modified: 
axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AbstractAarMojo.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AbstractAarMojo.java?rev=1364536&r1=1364535&r2=1364536&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AbstractAarMojo.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AbstractAarMojo.java
 Mon Jul 23 07:53:50 2012
@@ -177,7 +177,7 @@ public abstract class AbstractAarMojo
 // TODO: utilise appropriate methods from project builder
 ScopeArtifactFilter filter = new ScopeArtifactFilter(
 Artifact.SCOPE_RUNTIME);
-if (!artifact.isOptional() && filter.include(artifact)) {
+if (filter.include(artifact)) {
 String type = artifact.getType();
 if ("jar".equals(type)) {
 copyFileIfModified(artifact.getFile(), new File(

Modified: 
axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/AbstractMarMojo.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/AbstractMarMojo.java?rev=1364536&r1=1364535&r2=1364536&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/AbstractMarMojo.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/AbstractMarMojo.java
 Mon Jul 23 07:53:50 2012
@@ -156,7 +156,7 @@ public abstract class AbstractMarMojo
 
// TODO: utilise appropriate methods from project 
builder
ScopeArtifactFilter filter = new ScopeArtifactFilter( 
Artifact.SCOPE_RUNTIME );
-   if ( !artifact.isOptional() && filter.include( artifact 
) )
+   if (filter.include( artifact ) )
{
String type = artifact.getType();
if ( "jar".equals( type ) )

svn commit: r1364537 - in /axis/axis2/java/core/branches/1_6: ./ modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/ modules/tool/axis2-mar-maven-plugin/src/main/java/org/ap

2012-07-23 Thread sagara 
Author: sagara
Date: Mon Jul 23 07:58:46 2012
New Revision: 1364537

URL: http://svn.apache.org/viewvc?rev=1364537&view=rev
Log:
 Merged r1364536  to 1.6 branch.

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

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

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

Propchange: axis/axis2/java/core/branches/1_6/
--
  Merged /axis/axis2/java/core/trunk:r1360573,1362377,1364536

Modified: 
axis/axis2/java/core/branches/1_6/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AbstractAarMojo.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AbstractAarMojo.java?rev=1364537&r1=1364536&r2=1364537&view=diff
==
--- 
axis/axis2/java/core/branches/1_6/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AbstractAarMojo.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AbstractAarMojo.java
 Mon Jul 23 07:58:46 2012
@@ -177,7 +177,7 @@ public abstract class AbstractAarMojo
 // TODO: utilise appropriate methods from project builder
 ScopeArtifactFilter filter = new ScopeArtifactFilter(
 Artifact.SCOPE_RUNTIME);
-if (!artifact.isOptional() && filter.include(artifact)) {
+if (filter.include(artifact)) {
 String type = artifact.getType();
 if ("jar".equals(type)) {
 copyFileIfModified(artifact.getFile(), new File(

Modified: 
axis/axis2/java/core/branches/1_6/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/AbstractMarMojo.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/AbstractMarMojo.java?rev=1364537&r1=1364536&r2=1364537&view=diff
==
--- 
axis/axis2/java/core/branches/1_6/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/AbstractMarMojo.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/AbstractMarMojo.java
 Mon Jul 23 07:58:46 2012
@@ -156,7 +156,7 @@ public abstract class AbstractMarMojo
 
// TODO: utilise appropriate methods from project 
builder
ScopeArtifactFilter filter = new ScopeArtifactFilter( 
Artifact.SCOPE_RUNTIME );
-   if ( !artifact.isOptional() && filter.include( artifact 
) )
+   if (filter.include( artifact ) )
{
String type = artifact.getType();
if ( "jar".equals( type ) )