[Carbon-commits] [Carbon] svn commit r115142 - in branches/carbon/3.2.0/components/wsdl2code/org.wso2.carbon.modules.wsdl2code/3.2.3: . src/main/java/org/wso2/carbon/wsdl2code
supunm at wso2.com
supunm at wso2.com
Mon Oct 31 01:12:19 EDT 2011
Author: supunm
Date: Sun Oct 30 22:12:19 2011
New Revision: 115142
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=115142
Log:
adding wsdl2code/3.2.3 for STRATOS-1759
Added:
branches/carbon/3.2.0/components/wsdl2code/org.wso2.carbon.modules.wsdl2code/3.2.3/src/main/java/org/wso2/carbon/wsdl2code/CodegenDownloadData.java
Modified:
branches/carbon/3.2.0/components/wsdl2code/org.wso2.carbon.modules.wsdl2code/3.2.3/pom.xml
branches/carbon/3.2.0/components/wsdl2code/org.wso2.carbon.modules.wsdl2code/3.2.3/src/main/java/org/wso2/carbon/wsdl2code/WSDL2Code.java
Modified: branches/carbon/3.2.0/components/wsdl2code/org.wso2.carbon.modules.wsdl2code/3.2.3/pom.xml
URL: http://wso2.org/svn/browse/wso2/branches/carbon/3.2.0/components/wsdl2code/org.wso2.carbon.modules.wsdl2code/3.2.3/pom.xml?rev=115142&r1=115141&r2=115142&view=diff
==============================================================================
--- branches/carbon/3.2.0/components/wsdl2code/org.wso2.carbon.modules.wsdl2code/3.2.3/pom.xml (original)
+++ branches/carbon/3.2.0/components/wsdl2code/org.wso2.carbon.modules.wsdl2code/3.2.3/pom.xml Sun Oct 30 22:12:19 2011
@@ -28,7 +28,7 @@
<packaging>bundle</packaging>
<name>WSO2 Carbon - WSDL2Code BE</name>
<description>This is the core module of the project.</description>
- <version>3.2.2</version>
+ <version>3.2.3</version>
<dependencies>
<dependency>
Added: branches/carbon/3.2.0/components/wsdl2code/org.wso2.carbon.modules.wsdl2code/3.2.3/src/main/java/org/wso2/carbon/wsdl2code/CodegenDownloadData.java
URL: http://wso2.org/svn/browse/wso2/branches/carbon/3.2.0/components/wsdl2code/org.wso2.carbon.modules.wsdl2code/3.2.3/src/main/java/org/wso2/carbon/wsdl2code/CodegenDownloadData.java?pathrev=115142
==============================================================================
--- (empty file)
+++ branches/carbon/3.2.0/components/wsdl2code/org.wso2.carbon.modules.wsdl2code/3.2.3/src/main/java/org/wso2/carbon/wsdl2code/CodegenDownloadData.java Sun Oct 30 22:12:19 2011
@@ -0,0 +1,42 @@
+/*
+ * ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * ~
+ * ~ WSO2 Inc. licenses this file to you under the Apache License,
+ * ~ Version 2.0 (the "License"); you may not use this file except
+ * ~ in compliance with the License.
+ * ~ You may obtain a copy of the License at
+ * ~
+ * ~ http://www.apache.org/licenses/LICENSE-2.0
+ * ~
+ * ~ Unless required by applicable law or agreed to in writing,
+ * ~ software distributed under the License is distributed on an
+ * ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * ~ KIND, either express or implied. See the License for the
+ * ~ specific language governing permissions and limitations
+ * ~ under the License.
+ */
+
+package org.wso2.carbon.wsdl2code;
+
+import javax.activation.DataHandler;
+
+public class CodegenDownloadData {
+ private DataHandler codegenFileData;
+ private String fileName;
+
+ public DataHandler getCodegenFileData() {
+ return codegenFileData;
+ }
+
+ public void setCodegenFileData(DataHandler codegenFileData) {
+ this.codegenFileData = codegenFileData;
+ }
+
+ public String getFileName() {
+ return fileName;
+ }
+
+ public void setFileName(String fileName) {
+ this.fileName = fileName;
+ }
+}
Modified: branches/carbon/3.2.0/components/wsdl2code/org.wso2.carbon.modules.wsdl2code/3.2.3/src/main/java/org/wso2/carbon/wsdl2code/WSDL2Code.java
URL: http://wso2.org/svn/browse/wso2/branches/carbon/3.2.0/components/wsdl2code/org.wso2.carbon.modules.wsdl2code/3.2.3/src/main/java/org/wso2/carbon/wsdl2code/WSDL2Code.java?rev=115142&r1=115141&r2=115142&view=diff
==============================================================================
--- branches/carbon/3.2.0/components/wsdl2code/org.wso2.carbon.modules.wsdl2code/3.2.3/src/main/java/org/wso2/carbon/wsdl2code/WSDL2Code.java (original)
+++ branches/carbon/3.2.0/components/wsdl2code/org.wso2.carbon.modules.wsdl2code/3.2.3/src/main/java/org/wso2/carbon/wsdl2code/WSDL2Code.java Sun Oct 30 22:12:19 2011
@@ -38,11 +38,10 @@
import org.jaxen.XPath;
import org.wso2.carbon.core.AbstractAdmin;
import org.wso2.carbon.core.transports.http.HttpTransportListener;
-import org.wso2.carbon.utils.ArchiveManipulator;
-import org.wso2.carbon.utils.FileManipulator;
-import org.wso2.carbon.utils.NetworkUtils;
-import org.wso2.carbon.utils.WSO2Constants;
+import org.wso2.carbon.utils.*;
+import javax.activation.DataHandler;
+import javax.activation.FileDataSource;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
@@ -64,7 +63,6 @@
import java.io.InputStream;
import java.net.SocketException;
import java.util.ArrayList;
-import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -96,14 +94,12 @@
* @return String
* @throws AxisFault
*/
- public String codegen(String[] options) throws AxisFault {
+ public CodegenDownloadData codegen(String[] options) throws AxisFault {
String uuid = String.valueOf(System.currentTimeMillis() + Math.random());
ConfigurationContext configContext = getConfigContext();
- String codegenOutputDir =
- configContext
- .getProperty(WSO2Constants.WORK_DIR) + File.separator + "tools_codegen" +
- File.separator + uuid + File.separator;
+ String codegenOutputDir = configContext.getProperty(ServerConstants.WORK_DIR) + File.separator +
+ "tools_codegen" + File.separator + uuid + File.separator;
System.getProperties().remove("project.base.dir");
System.getProperties().remove("name");
System.setProperty("project.base.dir", codegenOutputDir);
@@ -170,9 +166,10 @@
try {
//achive destination
uuid = String.valueOf(System.currentTimeMillis() + Math.random());
- File destDir = new File(configContext.getProperty(WSO2Constants.WORK_DIR) + File.separator + "tools_codegen" +
- File.separator +
- uuid);
+ File destDir = new File(configContext.getProperty(ServerConstants.WORK_DIR) + File.separator +
+ "tools_codegen" +
+ File.separator +
+ uuid);
if (!destDir.exists()) {
destDir.mkdirs();
}
@@ -233,15 +230,20 @@
new ArchiveManipulator().archiveDir(destArchive, new File(codegenOutputDir).getPath());
FileManipulator.deleteDir(new File(codegenOutputDir));
- Map fileResourcesMap =
- (Map) configContext.getProperty(WSO2Constants.FILE_RESOURCE_MAP);
- if (fileResourcesMap == null) {
- fileResourcesMap = new Hashtable();
- configContext.setProperty(WSO2Constants.FILE_RESOURCE_MAP, fileResourcesMap);
+ DataHandler handler;
+ if (destArchive != null) {
+ File file = new File(destArchive);
+ FileDataSource datasource = new FileDataSource(file);
+ handler = new DataHandler(datasource);
+
+ CodegenDownloadData data = new CodegenDownloadData();
+ data.setFileName(file.getName());
+ data.setCodegenFileData(handler);
+ return data;
+ } else {
+ return null;
}
- fileResourcesMap.put(destFileName, destArchive);
- return "../../filedownload?id=" + destFileName;
} catch (IOException e) {
String msg = WSDL2Code.class.getName() + " IOException has occured.";
More information about the Carbon-commits
mailing list