svn commit: r929441 - in /axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring: cfgctx/ service/ util/

2010-03-31 Thread veithen 
Author: veithen
Date: Wed Mar 31 09:20:31 2010
New Revision: 929441

URL: http://svn.apache.org/viewvc?rev=929441&view=rev
Log:
AXIS2-4662: Some simplifications of the PoC code.

Added:

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/util/

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/util/SingletonFactoryBean.java
   (with props)
Modified:

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/cfgctx/ConfigurationContextFactoryBean.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/cfgctx/ListenerManagerFactoryBean.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/service/PojoServiceFactoryBean.java

Modified: 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/cfgctx/ConfigurationContextFactoryBean.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/cfgctx/ConfigurationContextFactoryBean.java?rev=929441&r1=929440&r2=929441&view=diff
==
--- 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/cfgctx/ConfigurationContextFactoryBean.java
 (original)
+++ 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/cfgctx/ConfigurationContextFactoryBean.java
 Wed Mar 31 09:20:31 2010
@@ -23,13 +23,11 @@ import org.apache.axis2.context.Configur
 import org.apache.axis2.description.TransportInDescription;
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.engine.AxisConfiguration;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.InitializingBean;
+import org.apache.axis2.spring.util.SingletonFactoryBean;
 
-public class ConfigurationContextFactoryBean implements FactoryBean, 
InitializingBean {
+public class ConfigurationContextFactoryBean extends 
SingletonFactoryBean {
 private TransportInDescription[] transportInDescriptions;
 private TransportOutDescription[] transportOutDescriptions;
-private ConfigurationContext configurationContext;
 
 public void setTransportInDescriptions(TransportInDescription[] 
transportInDescriptions) {
 this.transportInDescriptions = transportInDescriptions;
@@ -39,16 +37,13 @@ public class ConfigurationContextFactory
 this.transportOutDescriptions = transportOutDescriptions;
 }
 
-public Class getObjectType() {
-return ConfigurationContext.class;
+public ConfigurationContextFactoryBean() {
+super(ConfigurationContext.class);
 }
-
-public boolean isSingleton() {
-return true;
-}
-
-public void afterPropertiesSet() throws Exception {
-configurationContext = 
ConfigurationContextFactory.createBasicConfigurationContext("axis2_default_spring.xml");
+
+@Override
+protected ConfigurationContext create() throws Exception {
+ConfigurationContext configurationContext = 
ConfigurationContextFactory.createBasicConfigurationContext("axis2_default_spring.xml");
 //  configurationContext = 
ConfigurationContextFactory.createEmptyConfigurationContext();
 AxisConfiguration config = configurationContext.getAxisConfiguration();
 if (transportInDescriptions != null) {
@@ -61,9 +56,6 @@ public class ConfigurationContextFactory
 config.addTransportOut(description);
 }
 }
-}
-
-public Object getObject() throws Exception {
 return configurationContext;
 }
 }

Modified: 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/cfgctx/ListenerManagerFactoryBean.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/cfgctx/ListenerManagerFactoryBean.java?rev=929441&r1=929440&r2=929441&view=diff
==
--- 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/cfgctx/ListenerManagerFactoryBean.java
 (original)
+++ 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/cfgctx/ListenerManagerFactoryBean.java
 Wed Mar 31 09:20:31 2010
@@ -20,36 +20,28 @@ package org.apache.axis2.spring.cfgctx;
 
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.engine.ListenerManager;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.FactoryBean;
-impor

svn commit: r929531 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java

2010-03-31 Thread scheu 
Author: scheu
Date: Wed Mar 31 13:29:11 2010
New Revision: 929531

URL: http://svn.apache.org/viewvc?rev=929531&view=rev
Log:
Quick Change to WSDL11ToAxisServiceBuilder to add a missing xml namespace 
definition if it is not defined.
Contributor: Rich Scheuerle and Davanum Srinivas

Modified:

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

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java?rev=929531&r1=929530&r2=929531&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
 Wed Mar 31 13:29:11 2010
@@ -2047,6 +2047,12 @@ public class WSDL11ToAxisServiceBuilder 
 String prefix;
 if 
(XMLSCHEMA_NAMESPACE_URI.equals(schemaTypeName.getNamespaceURI())) {
 prefix = xsdPrefix;
+if(log.isDebugEnabled()) {
+log.debug("Unable to find a namespace for " + xsdPrefix + 
". Creating a new namespace attribute");
+}
+
cmplxTypeSequence.setAttributeNS("http://www.w3.org/2000/xmlns/";,
+"xmlns:" + xsdPrefix,
+XMLSCHEMA_NAMESPACE_URI);
 } else {
 // this schema is a third party one. So we need to have
 // an import statement in our generated schema

svn commit: r929538 - /axis/axis2/java/core/trunk/modules/integration/pom.xml

2010-03-31 Thread veithen 
Author: veithen
Date: Wed Mar 31 13:49:05 2010
New Revision: 929538

URL: http://svn.apache.org/viewvc?rev=929538&view=rev
Log:
AXIS2-4666: Switch compiler to fork mode to avoid OutOfMemoryError.

Modified:
axis/axis2/java/core/trunk/modules/integration/pom.xml

Modified: axis/axis2/java/core/trunk/modules/integration/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/pom.xml?rev=929538&r1=929537&r2=929538&view=diff
==
--- axis/axis2/java/core/trunk/modules/integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/integration/pom.xml Wed Mar 31 13:49:05 
2010
@@ -314,6 +314,9 @@
 
 1.5
 1.5
+
+true