You are viewing a plain text version of this content. The canonical link for it is here.
Posted to muse-commits@ws.apache.org by da...@apache.org on 2006/12/10 01:34:26 UTC
svn commit: r485104 - in /webservices/muse/trunk/modules/muse-tools:
resources/common/muse.xml
src/org/apache/muse/tools/generator/projectizer/MiniProjectizer.java
src/org/apache/muse/tools/generator/projectizer/MiniProjectizerConstants.java
Author: danj
Date: Sat Dec 9 16:34:25 2006
New Revision: 485104
URL: http://svn.apache.org/viewvc?view=rev&rev=485104
Log:
MiniProjectizer was not copying in web.xml file to /WEB-INF. Generalized code that copies in build.xml file for this purpose.
Modified:
webservices/muse/trunk/modules/muse-tools/resources/common/muse.xml
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/MiniProjectizer.java
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/MiniProjectizerConstants.java
Modified: webservices/muse/trunk/modules/muse-tools/resources/common/muse.xml
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/resources/common/muse.xml?view=diff&rev=485104&r1=485103&r2=485104
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/resources/common/muse.xml (original)
+++ webservices/muse/trunk/modules/muse-tools/resources/common/muse.xml Sat Dec 9 16:34:25 2006
@@ -14,7 +14,7 @@
<persistence-location>router-entries</persistence-location>
</persistence>
</router>
- <resource-type>
+ <resource-type use-router-persistence="true">
<context-path/>
<wsdl>
<wsdl-file/>
Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/MiniProjectizer.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/MiniProjectizer.java?view=diff&rev=485104&r1=485103&r2=485104
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/MiniProjectizer.java (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/MiniProjectizer.java Sat Dec 9 16:34:25 2006
@@ -44,11 +44,12 @@
loadParameters(configuration);
File webContentDir = new File(_targetDirectory, MiniProjectizerConstants.WEB_CONTENT_DIR);
-
+ File webInfDir = new File(webContentDir, MiniProjectizerConstants.WEB_INF_DIR);
File webInfLibDir = new File(webContentDir, MiniProjectizerConstants.WEB_INF_LIB_DIR);
File museModulesDir = new File(System.getProperty(Axis2ProjectizerConstants.MUSE_HOME_PROPERTY),MiniProjectizerConstants.MODULES_DIR);
File museLibDir = new File(System.getProperty(Axis2ProjectizerConstants.MUSE_HOME_PROPERTY),MiniProjectizerConstants.LIB_DIR);
- copyJars(MiniProjectizerConstants.REQUIRED_MODULES, museModulesDir, webInfLibDir);
+
+ copyJars(MiniProjectizerConstants.REQUIRED_MODULES, museModulesDir, webInfLibDir);
copyJars(MiniProjectizerConstants.REQUIRED_LIBRARIES, museLibDir, webInfLibDir);
File descriptorFile = new File(
@@ -61,8 +62,9 @@
createJavaSources(javaSourceDir, _filesMaps);
- createBuildFile(_targetDirectory, MiniProjectizerConstants.BUILD_FILE_RESOURCE, MiniProjectizerConstants.BUILD_FILE);
-
+ createFileFromResource(_targetDirectory, MiniProjectizerConstants.BUILD_FILE_RESOURCE, MiniProjectizerConstants.BUILD_FILE);
+ createFileFromResource(webInfDir, MiniProjectizerConstants.WEB_XML_RESOURCE, MiniProjectizerConstants.WEB_XML_FILE);
+
File wsdldir = new File(
webContentDir,
MiniProjectizerConstants.WSDL_DIR);
@@ -96,10 +98,10 @@
writeToFileCheck(wsdl, wsdlFile);
}
- protected void createBuildFile(File baseTargetDir, String buildFileResource, String buildFile) throws Exception {
- InputStream buildTemplate = FileUtils.loadFromContext(this.getClass(),buildFileResource);
- File build = new File(baseTargetDir, buildFile);
- copyStreamCheck(buildTemplate, build);
+ protected void createFileFromResource(File baseTargetDir, String fileResource, String fileName) throws Exception {
+ InputStream template = FileUtils.loadFromContext(this.getClass(),fileResource);
+ File file = new File(baseTargetDir, fileName);
+ copyStreamCheck(template, file);
}
Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/MiniProjectizerConstants.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/MiniProjectizerConstants.java?view=diff&rev=485104&r1=485103&r2=485104
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/MiniProjectizerConstants.java (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/MiniProjectizerConstants.java Sat Dec 9 16:34:25 2006
@@ -9,13 +9,15 @@
String WEB_CONTENT_DIR = "WebContent";
- String WEB_INF_LIB_DIR = "WEB-INF/lib";
+ String WEB_INF_DIR = "WEB-INF";
+
+ String WEB_INF_LIB_DIR = WEB_INF_DIR + "/lib";
String MODULES_DIR = "modules";
String LIB_DIR = "lib";
- String DESCRIPTOR_FILE = "WEB-INF/classes/muse.xml";
+ String DESCRIPTOR_FILE = WEB_INF_DIR + "/classes/muse.xml";
String JAVA_SRC_DIR = "JavaSource";
@@ -24,10 +26,14 @@
String RESOURCES_DIR = "/resources/mini/";
String BUILD_FILE_RESOURCE = RESOURCES_DIR + "build.xml";
+
+ String WEB_XML_RESOURCE = RESOURCES_DIR + "web.xml";
+
+ String WEB_XML_FILE = "web.xml";
- String WSDL_DIR = "WEB-INF/classes/wsdl";
+ String WSDL_DIR = WEB_INF_DIR + "/classes/wsdl";
- String ROUTER_ENTRIES_DIR = "WEB-INF/classes/router-entries";
+ String ROUTER_ENTRIES_DIR = WEB_INF_DIR + "/classes/router-entries";
String WSDL_RELATIVE_PATH = "/wsdl/";
}
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org