Author: sandakith
Date: Mon Mar 26 23:52:55 2007
New Revision: 522787
URL: http://svn.apache.org/viewvc?view=rev&rev=522787
Log:
fix the two issues reported on AXIS2-2388
Modified:
webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/FileCopier.java
webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/control/Controller.java
webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ServiceArchiveOutputLocationPage.java
Modified:
webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/FileCopier.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/FileCopier.java?view=diff&rev=522787&r1=522786&r2=522787
==============================================================================
---
webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/FileCopier.java
(original)
+++
webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/FileCopier.java
Mon Mar 26 23:52:55 2007
@@ -36,14 +36,13 @@
if (sourceFile.isFile())
this.setFile(sourceFile);
else {
- FileSet fileset = new FileSet();
- fileset.setDir(sourceFile);
- if (filter!=null){
- if (filter.matches("\\.\\w*")){
- fileset.setIncludes("*/**/*"+filter);
- }
- }
-
+ FileSet fileset = new FileSet();
+ fileset.setDir(sourceFile);
+ if (filter!=null){
+ if (filter.matches("\\.\\w*")){
+ fileset.setIncludes("**/*"+filter);
+ }
+ }
this.addFileset(fileset);
}
this.setTodir(destinationDirectory);
Modified:
webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/control/Controller.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/control/Controller.java?view=diff&rev=522787&r1=522786&r2=522787
==============================================================================
---
webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/control/Controller.java
(original)
+++
webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/control/Controller.java
Mon Mar 26 23:52:55 2007
@@ -148,11 +148,13 @@
outputFolder = new File(page3Bean.getOutputFolderName());
outputFileName = page3Bean.getOutputFileName();
- if (!outputFileName.toLowerCase().endsWith(".jar")) {
- outputFileName = outputFileName + ".jar";
+ if (!outputFileName.toLowerCase().endsWith(".jar") &&
!outputFileName.toLowerCase().endsWith(".aar")) {
+ outputFileName = outputFileName + ".aar";
}
File tempFileFolder = null;
+ String xmlFilter = ".xml";
+ String wsdlFilter = ".wsdl";
try {
//create a temporary directory and copy the files
@@ -169,14 +171,14 @@
//copy the classes
copier.copyFiles(classFileFolder,
tempFileFolder,page1Bean.getFilter());
//copy the service.xml
- copier.copyFiles(serviceFile, metaInfFolder,null);
+ copier.copyFiles(serviceFile, metaInfFolder,xmlFilter);
//copy the libs
for (int i=0;i < fileList.size();i++){
copier.copyFiles((File)fileList.get(i),libFolder,null);
}
if (isWSDLAvailable){
- new FileCopier().copyFiles(wsdlFile, metaInfFolder,null);
+ new FileCopier().copyFiles(wsdlFile, metaInfFolder,wsdlFilter);
}
//jar the temp directory. the output folder will be created if
missing
new JarFileWriter().writeJarFile(outputFolder,
Modified:
webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ServiceArchiveOutputLocationPage.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ServiceArchiveOutputLocationPage.java?view=diff&rev=522787&r1=522786&r2=522787
==============================================================================
---
webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ServiceArchiveOutputLocationPage.java
(original)
+++
webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ServiceArchiveOutputLocationPage.java
Mon Mar 26 23:52:55 2007
@@ -32,7 +32,7 @@
public class ServiceArchiveOutputLocationPage extends
AbstractServiceWizardPage {
- private static final String DEFAULT_JAR_NAME = "my_service.aar";
+ private static final String DEFAULT_JAR_NAME = "my_service";
private Text outputFileLocationTextBox;
private Button browseButton;
private Text outputFileNameTextbox;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
