Author: azeez
Date: Mon Dec 3 06:58:13 2007
New Revision: 10443
Log:
Merging the WSAS 2.1 branch to the trunk
Added:
trunk/commons/plugins/
- copied from r10403, branches/wsas/java/2.1/commons/plugins/
trunk/commons/plugins/js-plugin/
- copied from r10403, branches/wsas/java/2.1/commons/plugins/js-plugin/
trunk/commons/plugins/js-plugin/src/
- copied from r10403,
branches/wsas/java/2.1/commons/plugins/js-plugin/src/
trunk/commons/plugins/js-plugin/src/main/
- copied from r10403,
branches/wsas/java/2.1/commons/plugins/js-plugin/src/main/
trunk/commons/plugins/js-plugin/src/main/java/
- copied from r10403,
branches/wsas/java/2.1/commons/plugins/js-plugin/src/main/java/
trunk/commons/plugins/js-plugin/src/main/java/org/
- copied from r10403,
branches/wsas/java/2.1/commons/plugins/js-plugin/src/main/java/org/
trunk/commons/plugins/js-plugin/src/main/java/org/wso2/
- copied from r10403,
branches/wsas/java/2.1/commons/plugins/js-plugin/src/main/java/org/wso2/
trunk/commons/plugins/js-plugin/src/main/java/org/wso2/maven/
- copied from r10403,
branches/wsas/java/2.1/commons/plugins/js-plugin/src/main/java/org/wso2/maven/
trunk/commons/plugins/js-plugin/src/main/java/org/wso2/maven/plugins/
- copied from r10403,
branches/wsas/java/2.1/commons/plugins/js-plugin/src/main/java/org/wso2/maven/plugins/
trunk/commons/plugins/list-poms/
- copied from r10403, branches/wsas/java/2.1/commons/plugins/list-poms/
trunk/commons/plugins/list-poms/src/
- copied from r10403,
branches/wsas/java/2.1/commons/plugins/list-poms/src/
trunk/commons/plugins/list-poms/src/main/
- copied from r10403,
branches/wsas/java/2.1/commons/plugins/list-poms/src/main/
trunk/commons/plugins/list-poms/src/main/java/
- copied from r10403,
branches/wsas/java/2.1/commons/plugins/list-poms/src/main/java/
trunk/commons/plugins/list-poms/src/main/java/org/
- copied from r10403,
branches/wsas/java/2.1/commons/plugins/list-poms/src/main/java/org/
trunk/commons/plugins/list-poms/src/main/java/org/wso2/
- copied from r10403,
branches/wsas/java/2.1/commons/plugins/list-poms/src/main/java/org/wso2/
trunk/commons/plugins/list-poms/src/main/java/org/wso2/maven/
- copied from r10403,
branches/wsas/java/2.1/commons/plugins/list-poms/src/main/java/org/wso2/maven/
trunk/commons/plugins/list-poms/src/main/java/org/wso2/maven/plugins/
- copied from r10403,
branches/wsas/java/2.1/commons/plugins/list-poms/src/main/java/org/wso2/maven/plugins/
trunk/commons/plugins/sm-list-plugin/
- copied from r10403,
branches/wsas/java/2.1/commons/plugins/sm-list-plugin/
trunk/commons/plugins/sm-list-plugin/src/
- copied from r10403,
branches/wsas/java/2.1/commons/plugins/sm-list-plugin/src/
trunk/commons/plugins/sm-list-plugin/src/main/
- copied from r10403,
branches/wsas/java/2.1/commons/plugins/sm-list-plugin/src/main/
trunk/commons/plugins/sm-list-plugin/src/main/java/
- copied from r10403,
branches/wsas/java/2.1/commons/plugins/sm-list-plugin/src/main/java/
trunk/commons/plugins/sm-list-plugin/src/main/java/org/
- copied from r10403,
branches/wsas/java/2.1/commons/plugins/sm-list-plugin/src/main/java/org/
trunk/commons/plugins/sm-list-plugin/src/main/java/org/wso2/
- copied from r10403,
branches/wsas/java/2.1/commons/plugins/sm-list-plugin/src/main/java/org/wso2/
trunk/commons/plugins/sm-list-plugin/src/main/java/org/wso2/maven/
- copied from r10403,
branches/wsas/java/2.1/commons/plugins/sm-list-plugin/src/main/java/org/wso2/maven/
trunk/commons/plugins/sm-list-plugin/src/main/java/org/wso2/maven/plugins/
- copied from r10403,
branches/wsas/java/2.1/commons/plugins/sm-list-plugin/src/main/java/org/wso2/maven/plugins/
Modified:
trunk/commons/mex/pom.xml
trunk/commons/plugins/js-plugin/pom.xml
trunk/commons/plugins/js-plugin/src/main/java/org/wso2/maven/plugins/JSMojo.java
trunk/commons/plugins/list-poms/pom.xml
trunk/commons/plugins/list-poms/src/main/java/org/wso2/maven/plugins/MyMojo.java
trunk/commons/plugins/list-poms/src/main/java/org/wso2/maven/plugins/POMDownloadMojo.java
trunk/commons/plugins/sm-list-plugin/pom.xml
trunk/commons/plugins/sm-list-plugin/src/main/java/org/wso2/maven/plugins/MyMojo.java
trunk/commons/plugins/sm-list-plugin/src/main/java/org/wso2/maven/plugins/ServiceModuleListMojo.java
trunk/commons/sandesha2-persistence/pom.xml
trunk/commons/statistics/modules/core/src/main/java/org/wso2/statistics/module/ResponseTimeHandler.java
trunk/commons/statistics/pom.xml
trunk/commons/tracer/pom.xml
trunk/commons/utils/pom.xml
trunk/commons/utils/src/main/java/org/wso2/utils/SessionContextUtil.java
trunk/commons/wsdl-converter/pom.xml
trunk/commons/wsdl-converter/src/main/java/org/wso2/tryit/GenericAJAXClient.java
trunk/commons/wsdl-converter/src/main/java/org/wso2/tryit/ProxyMessageReceiver.java
trunk/commons/wsdl-converter/www/wsdlconverter.js
trunk/commons/wsdl-converter/www/wsdlconverter.xsl
trunk/commons/wsdl-view/pom.xml
trunk/commons/wsdl-view/src/main/java/org/wso2/wsdlview/WSDLView.java
trunk/commons/wsdl-view/src/main/resources/wsdlview-options.xml
trunk/commons/wsdl-view/www/wsdlview.js
trunk/commons/wsdl-view/www/wsdlview_wizard2.xsl
trunk/commons/wsdl-view/www/wsdlview_wizard_resources.xsl
trunk/commons/xfer/pom.xml
trunk/commons/xkms/pom.xml
Modified: trunk/commons/mex/pom.xml
==============================================================================
--- trunk/commons/mex/pom.xml (original)
+++ trunk/commons/mex/pom.xml Mon Dec 3 06:58:13 2007
@@ -217,6 +217,35 @@
</pluginRepositories>
+ <profiles>
+ <profile>
+ <activation>
+ <property>
+ <name>sign</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+
<distributionManagement>
<repository>
<id>wso2-maven2-repository</id>
Modified: trunk/commons/plugins/js-plugin/pom.xml
==============================================================================
--- branches/wsas/java/2.1/commons/plugins/js-plugin/pom.xml (original)
+++ trunk/commons/plugins/js-plugin/pom.xml Mon Dec 3 06:58:13 2007
@@ -5,7 +5,7 @@
<groupId>org.wso2.maven.plugins</groupId>
<artifactId>js-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>2.1-SNAPSHOT</version>
+ <version>SNAPSHOT</version>
<name>js-plugin Maven Mojo</name>
<url>http://www.wso2.com</url>
<dependencies>
Modified:
trunk/commons/plugins/js-plugin/src/main/java/org/wso2/maven/plugins/JSMojo.java
==============================================================================
Modified: trunk/commons/plugins/list-poms/pom.xml
==============================================================================
Modified:
trunk/commons/plugins/list-poms/src/main/java/org/wso2/maven/plugins/MyMojo.java
==============================================================================
Modified:
trunk/commons/plugins/list-poms/src/main/java/org/wso2/maven/plugins/POMDownloadMojo.java
==============================================================================
Modified: trunk/commons/plugins/sm-list-plugin/pom.xml
==============================================================================
--- branches/wsas/java/2.1/commons/plugins/sm-list-plugin/pom.xml
(original)
+++ trunk/commons/plugins/sm-list-plugin/pom.xml Mon Dec 3 06:58:13 2007
@@ -5,7 +5,7 @@
<groupId>org.wso2.maven.plugins</groupId>
<artifactId>sm-list-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>2.1-SNAPSHOT</version>
+ <version>SNAPSHOT</version>
<name>sm-list-plugin Maven Mojo</name>
<url>http://www.wso2.com</url>
<dependencies>
Modified:
trunk/commons/plugins/sm-list-plugin/src/main/java/org/wso2/maven/plugins/MyMojo.java
==============================================================================
Modified:
trunk/commons/plugins/sm-list-plugin/src/main/java/org/wso2/maven/plugins/ServiceModuleListMojo.java
==============================================================================
Modified: trunk/commons/sandesha2-persistence/pom.xml
==============================================================================
--- trunk/commons/sandesha2-persistence/pom.xml (original)
+++ trunk/commons/sandesha2-persistence/pom.xml Mon Dec 3 06:58:13 2007
@@ -53,9 +53,9 @@
</releases>
</repository>
<repository>
- <id>dist-wso2</id>
- <name>WSO2 Repo</name>
- <url>http://dist.wso2.net/maven2</url>
+ <id>wso2-maven2-repository</id>
+ <name>WSO2 Repository</name>
+ <url>http://dist.wso2.org/maven2/</url>
</repository>
<repository>
<id>m2-snapshot-repository</id>
@@ -292,6 +292,35 @@
<module>modules/mar</module>
</modules>
+ <profiles>
+ <profile>
+ <activation>
+ <property>
+ <name>sign</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+
<distributionManagement>
<repository>
<id>wso2-maven2-repository</id>
Modified:
trunk/commons/statistics/modules/core/src/main/java/org/wso2/statistics/module/ResponseTimeHandler.java
==============================================================================
---
trunk/commons/statistics/modules/core/src/main/java/org/wso2/statistics/module/ResponseTimeHandler.java
(original)
+++
trunk/commons/statistics/modules/core/src/main/java/org/wso2/statistics/module/ResponseTimeHandler.java
Mon Dec 3 06:58:13 2007
@@ -44,13 +44,23 @@
}
public void flowComplete(MessageContext msgContext) {
- String mep = msgContext.getAxisOperation().getMessageExchangePattern();
- if (mep.equals(WSDL2Constants.MEP_URI_IN_ONLY) ||
- mep.equals(WSDL2Constants.MEP_URI_ROBUST_IN_ONLY)) {
- try {
- calculateResponseTimes(msgContext);
- } catch (AxisFault axisFault) {
- log.error("Cannot compute reponse times", axisFault);
+
+ if (msgContext != null) {
+ OperationContext opContext = msgContext.getOperationContext();
+ if (opContext != null) {
+ AxisOperation axisOp = opContext.getAxisOperation();
+ if (axisOp != null) {
+ String mep = axisOp.getMessageExchangePattern();
+ if (mep != null &&
+ (mep.equals(WSDL2Constants.MEP_URI_IN_ONLY) ||
+ mep.equals(WSDL2Constants.MEP_URI_ROBUST_IN_ONLY))) {
+ try {
+ calculateResponseTimes(msgContext);
+ } catch (AxisFault axisFault) {
+ log.error("Cannot compute reponse times",
axisFault);
+ }
+ }
+ }
}
}
}
Modified: trunk/commons/statistics/pom.xml
==============================================================================
--- trunk/commons/statistics/pom.xml (original)
+++ trunk/commons/statistics/pom.xml Mon Dec 3 06:58:13 2007
@@ -270,6 +270,35 @@
</properties>
+ <profiles>
+ <profile>
+ <activation>
+ <property>
+ <name>sign</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+
<modules>
<module>modules/core</module>
<module>modules/client</module>
Modified: trunk/commons/tracer/pom.xml
==============================================================================
--- trunk/commons/tracer/pom.xml (original)
+++ trunk/commons/tracer/pom.xml Mon Dec 3 06:58:13 2007
@@ -335,6 +335,35 @@
</snapshotRepository>
</distributionManagement>
+ <profiles>
+ <profile>
+ <activation>
+ <property>
+ <name>sign</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+
<properties>
<axis2.version>1.3</axis2.version>
<wso2utils.version>SNAPSHOT</wso2utils.version>
Modified: trunk/commons/utils/pom.xml
==============================================================================
--- trunk/commons/utils/pom.xml (original)
+++ trunk/commons/utils/pom.xml Mon Dec 3 06:58:13 2007
@@ -159,7 +159,31 @@
</dependency>
</dependencies>
</profile>
-
+ <profile>
+ <activation>
+ <property>
+ <name>sign</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<repositories>
Modified:
trunk/commons/utils/src/main/java/org/wso2/utils/SessionContextUtil.java
==============================================================================
--- trunk/commons/utils/src/main/java/org/wso2/utils/SessionContextUtil.java
(original)
+++ trunk/commons/utils/src/main/java/org/wso2/utils/SessionContextUtil.java
Mon Dec 3 06:58:13 2007
@@ -38,7 +38,7 @@
if (httpSession != null) {
sessionContext =
(SessionContext)
httpSession.getAttribute(Constants.SESSION_CONTEXT_PROPERTY);
- if (sessionContext == null && httpSession.isNew()) {
+ if (sessionContext == null) {
String cookieValueString = httpSession.getId();
sessionContext = new SessionContext(null);
sessionContext.setParent(ListenerManager.defaultConfigurationContext);
Modified: trunk/commons/wsdl-converter/pom.xml
==============================================================================
--- trunk/commons/wsdl-converter/pom.xml (original)
+++ trunk/commons/wsdl-converter/pom.xml Mon Dec 3 06:58:13 2007
@@ -319,11 +319,40 @@
</snapshotRepository>
</distributionManagement>
+ <profiles>
+ <profile>
+ <activation>
+ <property>
+ <name>sign</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+
<properties>
- <axis2.version>1.3</axis2.version>
+ <axis2.version>SNAPSHOT</axis2.version>
<wso2utils.version>SNAPSHOT</wso2utils.version>
- <axiom.version>1.2.5</axiom.version>
- <neethi.version>2.0.2</neethi.version>
+ <axiom.version>SNAPSHOT</axiom.version>
+ <neethi.version>SNAPSHOT</neethi.version>
<commons.logging.version>1.1</commons.logging.version>
<junit.version>3.8.2</junit.version>
<log4j.version>1.2.13</log4j.version>
Modified:
trunk/commons/wsdl-converter/src/main/java/org/wso2/tryit/GenericAJAXClient.java
==============================================================================
---
trunk/commons/wsdl-converter/src/main/java/org/wso2/tryit/GenericAJAXClient.java
(original)
+++
trunk/commons/wsdl-converter/src/main/java/org/wso2/tryit/GenericAJAXClient.java
Mon Dec 3 06:58:13 2007
@@ -113,10 +113,8 @@
throw AxisFault.makeFault(e);
}
service = builder.populateService();
- service.setName("TryItProxyService" +
Long.toString(System.currentTimeMillis()));
- AxisServiceGroup asg = new
AxisServiceGroup(MessageContext.getCurrentMessageContext()
+ updateMockProxyServiceGroup(service,
MessageContext.getCurrentMessageContext()
.getConfigurationContext().getAxisConfiguration());
- service.setParent(asg);
List exposeTxList = new ArrayList();
exposeTxList.add("http");
service.setExposedTransports(exposeTxList);
@@ -176,7 +174,7 @@
Map paramMap = new HashMap();
paramMap.put("wsrequest-location", "js/WSRequest.js");
paramMap.put("stub-location", "filedownload?id=" +
jsFileLocation.getUuid());
- paramMap.put("image-path", "extensions/core/images/");
+ paramMap.put("show-alternate", "false");
paramMap.put("fixendpoints", "false");
Util.transform(sigDomSource, tryItXSLSource, tryItResult,
paramMap, classLoader);
@@ -190,8 +188,6 @@
fileResourcesMap.put(htmlFileLocation.getUuid(),
files1[0].getAbsoluteFile().getAbsolutePath());
}
- updateMockProxyServiceGroup(service,
MessageContext.getCurrentMessageContext()
- .getConfigurationContext().getAxisConfiguration());
return WSO2Constants.ContextPaths.DOWNLOAD_PATH + "?id=" +
htmlFileLocation.getUuid();
} catch (IOException e) {
throw AxisFault.makeFault(e);
@@ -211,11 +207,11 @@
private synchronized void updateMockProxyServiceGroup(AxisService
axisService,
AxisConfiguration
axisConfig)
throws AxisFault {
- axisService.addParameter("supportSingleOperation", Boolean.TRUE);
+ /*axisService.addParameter("supportSingleOperation", Boolean.TRUE);
AxisOperation singleOP = new InOutAxisOperation(new
QName("invokeTryItProxyService"));
singleOP.setDocumentation("This operation is a 'passthrough' for all
operations in " +
" TryIt proxy service.");
- axisService.addOperation(singleOP);
+ axisService.addOperation(singleOP);*/
ProxyMessageReceiver receiver = new ProxyMessageReceiver();
PhasesInfo phaseInfo = axisConfig.getPhasesInfo();
for (Iterator i = axisService.getOperations(); i.hasNext();) {
@@ -230,6 +226,18 @@
serviceGroup = new AxisServiceGroup();
serviceGroup.setServiceGroupName(TRYIT_SG_NAME);
}
+
+ // resolving Axis service name conflicts.
+ AxisService testService =
axisConfig.getService(axisService.getName());
+ if (testService != null) {
+ for (int loop = 1 ; ;loop++) {
+ String testName = axisService.getName() + "_" + loop;
+ if (axisConfig.getService(testName) == null) {
+ axisService.setName(testName);
+ break;
+ }
+ }
+ }
serviceGroup.addService(axisService);
axisConfig.addServiceGroup(serviceGroup);
axisService.addParameter(LAST_TOUCH_TIME, new
Long(System.currentTimeMillis()));
Modified:
trunk/commons/wsdl-converter/src/main/java/org/wso2/tryit/ProxyMessageReceiver.java
==============================================================================
---
trunk/commons/wsdl-converter/src/main/java/org/wso2/tryit/ProxyMessageReceiver.java
(original)
+++
trunk/commons/wsdl-converter/src/main/java/org/wso2/tryit/ProxyMessageReceiver.java
Mon Dec 3 06:58:13 2007
@@ -88,7 +88,9 @@
//Create ServiceClient with deafult config context.
ServiceClient client = new ServiceClient(configCtx, null);
OMElement element = env.getBody().getFirstElement();
- element.detach();
+ if (element != null) {
+ element.detach();
+ }
Options options = new Options();
options.setTo(new EndpointReference(endpoint.getEndpointURL()));
options.setAction(inMessage.getWSAAction());
Modified: trunk/commons/wsdl-converter/www/wsdlconverter.js
==============================================================================
--- trunk/commons/wsdl-converter/www/wsdlconverter.js (original)
+++ trunk/commons/wsdl-converter/www/wsdlconverter.js Mon Dec 3 06:58:13 2007
@@ -11,16 +11,20 @@
wso2.tool.WC = {
validateAndSubmit : function() {
- var objForm = document.getElementById('wsdl11FormID');
- var inputObj = document.getElementById('filename');
- if (inputObj.value == "") {
- wso2.wsf.Util.alertWarning('Please Select a WSDL of Version 1.1');
- return false;
+ try {
+ var objForm = document.getElementById('wsdl11FormID');
+ var inputObj = document.getElementById('filename');
+ if (inputObj.value == "") {
+ wso2.wsf.Util.alertWarning('Please Select a WSDL of Version
1.1');
+ return false;
+ }
+ objForm.action = "fileupload/*";
+ FileExcutor.execute = this.wcserviceClient;
+ objForm.submit();
+ return true;
+ } catch(e) {
+ wso2.wsf.Util.alertWarning('You have selected an invalid WSDL
document.');
}
- objForm.action = "fileupload/*";
- FileExcutor.execute = this.wcserviceClient;
- objForm.submit();
- return true;
},
validateAndSubmitURL : function() {
Modified: trunk/commons/wsdl-converter/www/wsdlconverter.xsl
==============================================================================
--- trunk/commons/wsdl-converter/www/wsdlconverter.xsl (original)
+++ trunk/commons/wsdl-converter/www/wsdlconverter.xsl Mon Dec 3 06:58:13 2007
@@ -20,16 +20,19 @@
return wso2.tool.WC.validateAndSubmit();
</xsl:attribute>
<fieldset>
- <legend>Please Upload your WSDL 1.1</legend>
+ <legend>Select WSDL 1.1 document</legend>
<div>
+ <label>Select WSDL</label>
<input type="file" id="filename"
name="filename" size="50"/>
<br/>
- <input type="submit" id="wcButtonId"
value="Convert WSDL 1.1 --> 2.0 ">
- <xsl:attribute name="onclick">
- javascript:
- return
wso2.tool.WC.validateAndSubmit();
- </xsl:attribute>
- </input>
+ <div class="buttonrow">
+ <input type="submit" id="wcButtonId"
value="Convert WSDL 1.1 --> 2.0 ">
+ <xsl:attribute name="onclick">
+ javascript:
+ return
wso2.tool.WC.validateAndSubmit();
+ </xsl:attribute>
+ </input>
+ </div>
</div>
</fieldset>
</form>
@@ -44,17 +47,20 @@
return false;
</xsl:attribute>
<fieldset>
- <legend>Please type WSDL 1.1 document URL</legend>
+ <legend>Enter type WSDL 1.1 document URL</legend>
<div>
+ <label>Enter URL</label>
<input type="text" id="wsdl11URL"
name="wsdl11URL" size="50"/>
<br/>
- <input type="submit" id="wcURLButtonId"
value="Convert WSDL 1.1 --> 2.0 ">
- <xsl:attribute name="onclick">
- javascript:
- wso2.tool.WC.validateAndSubmitURL();
- return false;
- </xsl:attribute>
- </input>
+ <div class="buttonrow">
+ <input type="submit" id="wcURLButtonId"
value="Convert WSDL 1.1 --> 2.0 ">
+ <xsl:attribute name="onclick">
+ javascript:
+
wso2.tool.WC.validateAndSubmitURL();
+ return false;
+ </xsl:attribute>
+ </input>
+ </div>
</div>
</fieldset>
</form>
@@ -79,17 +85,20 @@
return false;
</xsl:attribute>
<fieldset>
- <legend>Please type WSDL 1.1 or 2.0 document
location</legend>
+ <legend>Enter WSDL 1.1 or 2.0 document
location</legend>
<div>
+ <label>Enter URL</label>
<input type="text" id="tryitFileName"
name="tryitFileName" size="50"/>
<br/>
- <input type="submit" id="tryitButtonId" value="Try
It">
- <xsl:attribute name="onclick">
- javascript:
- wso2.tool.WC.validateAndSubmitTryit();
- return false;
- </xsl:attribute>
- </input>
+ <div class="buttonrow">
+ <input type="submit" id="tryitButtonId"
value="Try It">
+ <xsl:attribute name="onclick">
+ javascript:
+ wso2.tool.WC.validateAndSubmitTryit();
+ return false;
+ </xsl:attribute>
+ </input>
+ </div>
</div>
</fieldset>
</form>
@@ -97,4 +106,4 @@
</fieldset>
</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
Modified: trunk/commons/wsdl-view/pom.xml
==============================================================================
--- trunk/commons/wsdl-view/pom.xml (original)
+++ trunk/commons/wsdl-view/pom.xml Mon Dec 3 06:58:13 2007
@@ -267,11 +267,40 @@
</snapshotRepository>
</distributionManagement>
+ <profiles>
+ <profile>
+ <activation>
+ <property>
+ <name>sign</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+
<properties>
- <axis2.version>1.3</axis2.version>
+ <axis2.version>SNAPSHOT</axis2.version>
<wso2utils.version>SNAPSHOT</wso2utils.version>
- <axiom.version>1.2.5</axiom.version>
- <neethi.version>2.0.2</neethi.version>
+ <axiom.version>SNAPSHOT</axiom.version>
+ <neethi.version>SNAPSHOT</neethi.version>
<commons.logging.version>1.1</commons.logging.version>
<junit.version>3.8.2</junit.version>
<log4j.version>1.2.13</log4j.version>
Modified: trunk/commons/wsdl-view/src/main/java/org/wso2/wsdlview/WSDLView.java
==============================================================================
--- trunk/commons/wsdl-view/src/main/java/org/wso2/wsdlview/WSDLView.java
(original)
+++ trunk/commons/wsdl-view/src/main/java/org/wso2/wsdlview/WSDLView.java
Mon Dec 3 06:58:13 2007
@@ -205,7 +205,9 @@
for (int j = 0; j < uuids.length; j++) {
String path = (String) fileResourcesMap.get(uuids[j]);
try {
- pathList.add(new File(path).toURL());
+ if (path != null && path.length() != 0) {
+ pathList.add(new File(path).toURL());
+ }
} catch (MalformedURLException e) {
log.error(e.getMessage(), e);
throw AxisFault.makeFault(e);
Modified: trunk/commons/wsdl-view/src/main/resources/wsdlview-options.xml
==============================================================================
--- trunk/commons/wsdl-view/src/main/resources/wsdlview-options.xml
(original)
+++ trunk/commons/wsdl-view/src/main/resources/wsdlview-options.xml Mon Dec
3 06:58:13 2007
@@ -80,7 +80,7 @@
</argument>
<argument uiType="option">
<name>wv</name>
- <description>Wsdl version - defaults to 1.1</description>
+ <description>WSDL version - defaults to 1.1</description>
<values>
<value>1.1</value>
<value>2.0</value>
Modified: trunk/commons/wsdl-view/www/wsdlview.js
==============================================================================
--- trunk/commons/wsdl-view/www/wsdlview.js (original)
+++ trunk/commons/wsdl-view/www/wsdlview.js Mon Dec 3 06:58:13 2007
@@ -63,65 +63,33 @@
bodyXML += '</req:wsdlviewWithResources>';
var callURL = wso2.wsf.Util.getServerURL() + "/" + "WSDLView" ;
wso2.wsf.Util.cursorWait();
- new wso2.wsf.WSRequest(callURL, "urn:wsdlviewWithResources", bodyXML,
startWSDLViewCallback, false, this.onError);
+ new wso2.wsf.WSRequest(callURL, "urn:wsdlviewWithResources", bodyXML,
startWSDLViewCallback);
},
- toWizard2 : function(fault) {
- var objForm = document.getElementById('wsdlviewjarupload');
- var fileArray = document.getElementsByName('jarResourceWSDLView');
- var len = fileArray.length;
- var hasValues = false;
- for (var j = 0; j < len; j++) {
- if (fileArray[j].value != "") {
- hasValues = true;
- break;
+ toWizard2 : function() {
+ try {
+ var objForm = document.getElementById('wsdlviewjarupload');
+ var fileArray = document.getElementsByName('jarResourceWSDLView');
+ var len = fileArray.length;
+ var hasValues = false;
+ for (var j = 0; j < len; j++) {
+ if (fileArray[j].value != "") {
+ hasValues = true;
+ break;
+ }
}
- }
- if (hasValues) {
- objForm.action = "fileupload/*";
- if (fault) {
- FileExcutor.execute = this.executeFailsafe;
- } else {
+ if (hasValues) {
+ objForm.action = "fileupload/*";
FileExcutor.execute = this.executeWizard2;
+ objForm.submit();
+ return true;
}
- objForm.submit();
- return true;
- }
- wso2.wsf.Util.alertWarning('Please select the resource(s)');
- return false;
- },
-
- executeFailsafe : function(newUUIDs) {
- var bodyXML = '<req:wsdlviewWithResources
xmlns:req="http://org.wso2.wsf/tools";>\n';
- for (var o in wso2.tool.WSDLView.options) {
- bodyXML += '<options><![CDATA[' + o + ']]></options>\n';
- var oVal = wso2.tool.WSDLView.options[o];
- if (oVal != null && oVal.length != 0) {
- bodyXML += '<options><![CDATA[' + oVal + ']]></options>\n';
- }
+ wso2.wsf.Util.alertWarning('Please select the resource(s)');
+ return false;
+ } catch(e) {
+ wso2.wsf.Util.alertWarning('You have selected an invalid resource
file.');
}
- if (typeof(wso2.tool.WSDLView.fileUuids) == "object") {
- for (var p in wso2.tool.WSDLView.fileUuids) {
- bodyXML += '<uuids>' + wso2.tool.WSDLView.fileUuids[p] +
'</uuids>\n';
- }
- } else {
- bodyXML += '<uuids>' + wso2.tool.WSDLView.fileUuids + '</uuids>\n';
- }
-
- if (typeof(newUUIDs) == "object") {
- for (var p in wso2.tool.WSDLView.fileUuids) {
- bodyXML += '<uuids>' + newUUIDs[p] + '</uuids>\n';
- }
- } else {
- bodyXML += '<uuids>' + newUUIDs + '</uuids>\n';
- }
-
- bodyXML += '</req:wsdlviewWithResources>';
- var callURL = wso2.wsf.Util.getServerURL() + "/" + "WSDLView" ;
- wso2.wsf.Util.cursorWait();
- new wso2.wsf.WSRequest(callURL, "urn:wsdlviewWithResources", bodyXML,
startWSDLViewCallback, false, this.onError);
-
},
executeWizard2 : function(obj) {
@@ -129,42 +97,6 @@
wso2.tool.WSDLView.getOptions();
},
- onError : function() {
- var error = this.req.error;
- if (!error) {
- var reason = "";
- var a = arguments;
- if (a.length > 0) {
- reason = a[0];
- }
- // This is to fix problems encountered in Windows browsers.
- var status = this.req._xmlhttp.status;
- if (status && status == 500) {
- return;
- } else {
- wso2.wsf.Util.alertWarning("Console has received an error.
Please refer" +
- " to system admin for more details.
" +
- reason.toString());
- return;
- }
- }
- if (error.detail.indexOf("NS_ERROR_NOT_AVAILABLE") > -1) {
- wso2.wsf.Util.alertWarning("Console has received an error. Please
refer " +
- "to system admin for more details. " +
- "NS_ERROR_NOT_AVAILABLE");
- return;
- }
- var er = error.reason;
- if (er.indexOf("java.lang.ClassNotFoundException") > -1) {
- var index = er.indexOf(":");
- var fqnc = er.substring(index + 1);
- wso2.tool.WSDLView.viewHelper("wizard-resources",
"divWSDLViewWizardThree", "wsdlview_wizard_resources.xsl", [["error",fqnc]]);
- } else {
- wso2.wsf.Util.alertWarning(er);
- }
-
- },
-
addLibraryFileuplod : function(objDiv) {
var blankLabelElem = document.createElement('label');
blankLabelElem.innerHTML = " ";
Modified: trunk/commons/wsdl-view/www/wsdlview_wizard2.xsl
==============================================================================
--- trunk/commons/wsdl-view/www/wsdlview_wizard2.xsl (original)
+++ trunk/commons/wsdl-view/www/wsdlview_wizard2.xsl Mon Dec 3 06:58:13 2007
@@ -14,7 +14,7 @@
<div id="formset">
<form>
<fieldset>
- <legend>WSDLView Options</legend>
+ <legend>Step 2: Select Options</legend>
<table class="styledLeft">
<thead>
<tr>
@@ -44,7 +44,7 @@
<xsl:template name="buttonRow">
<xsl:param name="parmCodegen"/>
<div class="codegenButtonRaw">
- <input type="button" value="Back">
+ <input type="button" value="< Back">
<xsl:attribute name="onClick">
history.back();
return false;
@@ -113,8 +113,7 @@
<xsl:when test="$uiType='text-area'">
<textarea>
<xsl:attribute
name="class">toolsClass</xsl:attribute>
- <xsl:attribute name="clos">40</xsl:attribute>
- <xsl:attribute name="rows">6</xsl:attribute>
+ <xsl:attribute
name="style">height:100px;width:345px</xsl:attribute>
<xsl:attribute name="id"><xsl:value-of
select="$name"/>_<xsl:value-of select="$idSuffix"/></xsl:attribute>
</textarea>
</xsl:when>
@@ -144,4 +143,4 @@
</xsl:if>
</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
Modified: trunk/commons/wsdl-view/www/wsdlview_wizard_resources.xsl
==============================================================================
--- trunk/commons/wsdl-view/www/wsdlview_wizard_resources.xsl (original)
+++ trunk/commons/wsdl-view/www/wsdlview_wizard_resources.xsl Mon Dec 3
06:58:13 2007
@@ -2,26 +2,20 @@
xmlns:ns="http://org.wso2.wsf/tools";>
<xsl:output method="html"/>
- <xsl:param name="error"/>
-
<xsl:template match="wizard-resources">
<fieldset style="border:none;">
<div>
- <h2>WSDLView (Add Jar Resources)</h2>
+ <h2>WSDLView</h2>
</div>
- <xsl:if test="$error">
- <div>
- <h4><font color="red">* <xsl:value-of
select="$error"/> class not found</font></h4>
- </div>
- </xsl:if>
<div id="formset">
<form id="wsdlviewjarupload" method="post"
name="wsdlviewjarupload"
enctype="multipart/form-data"
target="globalIFrame">
<fieldset>
- <div>
+ <legend>Step 1: Add Resources</legend>
+ <div>
<xsl:attribute
name="id">wsdlViewResourceDivId</xsl:attribute>
- <label>Add Resource(s)</label>
+ <label>Resource(s)</label>
<input type="file" id="jarResourceWSDLView"
name="jarResourceWSDLView" size="50"/>
<input type="button" value="+">
<xsl:attribute name="onClick">
@@ -31,34 +25,16 @@
</input>
</div>
<div class="buttonrow">
- <xsl:choose>
- <xsl:when test="$error">
- <input type="button" value="Back">
- <xsl:attribute name="onClick">
- history.back();
- return false;
- </xsl:attribute>
- </input>
- <input type="button" value="Generate">
- <xsl:attribute name="onClick">
-
javascript:wso2.tool.WSDLView.toWizard2(true);
- return false;
- </xsl:attribute>
- </input>
- </xsl:when>
- <xsl:otherwise>
- <input type="button" value="Next">
- <xsl:attribute name="onClick">
-
javascript:wso2.tool.WSDLView.toWizard2();
- return false;
- </xsl:attribute>
- </input>
- </xsl:otherwise>
- </xsl:choose>
+ <input type="button" value="Next >">
+ <xsl:attribute name="onClick">
+ javascript:wso2.tool.WSDLView.toWizard2();
+ return false;
+ </xsl:attribute>
+ </input>
</div>
</fieldset>
</form>
</div>
</fieldset>
</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
Modified: trunk/commons/xfer/pom.xml
==============================================================================
--- trunk/commons/xfer/pom.xml (original)
+++ trunk/commons/xfer/pom.xml Mon Dec 3 06:58:13 2007
@@ -188,6 +188,35 @@
<module>modules/samples</module>
</modules>
+ <profiles>
+ <profile>
+ <activation>
+ <property>
+ <name>sign</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+
<properties>
<axis2.version>1.3</axis2.version>
<wso2xfer.version>${pom.version}</wso2xfer.version>
Modified: trunk/commons/xkms/pom.xml
==============================================================================
--- trunk/commons/xkms/pom.xml (original)
+++ trunk/commons/xkms/pom.xml Mon Dec 3 06:58:13 2007
@@ -284,6 +284,31 @@
</dependency>
</dependencies>
</profile>
+ <profile>
+ <activation>
+ <property>
+ <name>sign</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
_______________________________________________
Commons-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/commons-dev
