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 2007/03/09 00:01:06 UTC
svn commit: r516218 - in
/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer:
OsgiAxis2Projectizer.java OsgiMiniProjectizer.java
Author: danj
Date: Thu Mar 8 15:01:05 2007
New Revision: 516218
URL: http://svn.apache.org/viewvc?view=rev&rev=516218
Log:
Fixed bug in createActivator() that caused file paths to be generated with Windows path separator ('\') in
all environments. We now use File objects to avoid specifying separator chars completely.
Modified:
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/OsgiAxis2Projectizer.java
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/OsgiMiniProjectizer.java
Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/OsgiAxis2Projectizer.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/OsgiAxis2Projectizer.java?view=diff&rev=516218&r1=516217&r2=516218
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/OsgiAxis2Projectizer.java (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/OsgiAxis2Projectizer.java Thu Mar 8 15:01:05 2007
@@ -36,15 +36,6 @@
* @author Andrew Eberbach (aeberbac)
*/
public class OsgiAxis2Projectizer extends J2EEAxis2Projectizer {
-
- static ConfigurationDataDescriptor[] REQUIRED_PARAMETERS =
- new ConfigurationDataDescriptor[] {
- ConfigurationData.FILES_MAP_LIST_CONFIGURATION,
- ConfigurationData.DESCRIPTOR_DOCUMENT_CONFIGURATION,
- ConfigurationData.WSDL_DOCUMENT_LIST_CONFIGURATION,
- ConfigurationData.OVERWRITE_CONFIGURATION,
- ConfigurationData.CAPABILITIES_MAP_LIST_CONFIGURATION
- };
public void projectize(ConfigurationData configuration) throws Exception {
ConfigurationData.checkConfiguration(this, configuration);
@@ -72,8 +63,9 @@
createActivatorFile(javaSourceDir, OsgiProjectizerConstants.ACTIVATOR_FILE_RESOURCE);
File routerEntriesDir = new File(_targetDirectory,OsgiProjectizerConstants.ROUTER_ENTRIES_DIR);
-
- createManifest(_targetDirectory, OsgiProjectizerConstants.OSGI_MANIFEST_FILE_RESOURCE, OsgiProjectizerConstants.OSGI_MANIFEST_FILE, getActivatorName());
+
+ String activatorName = getSymbolicName() + "." + OsgiProjectizerConstants.ACTIVATOR_NAME;
+ createManifest(_targetDirectory, OsgiProjectizerConstants.OSGI_MANIFEST_FILE_RESOURCE, OsgiProjectizerConstants.OSGI_MANIFEST_FILE, activatorName);
createConfigIni(_targetDirectory, OsgiProjectizerConstants.CONFIG_FILE_RESOURCE, OsgiProjectizerConstants.CONFIG_FILE);
@@ -111,20 +103,16 @@
copyStreamCheck(configIS, configFile);
}
- protected String getActivatorName() {
- return getSymbolicName() + "." + OsgiProjectizerConstants.ACTIVATOR_NAME;
- }
-
protected void createActivatorFile(File srcDir, String activatorFileResource) throws Exception {
InputStream activatorTemplateIS = FileUtils.loadFromContext(OsgiAxis2Projectizer.class, activatorFileResource);
Object[] filler = { getSymbolicName() };
String newActivator = loadString(activatorTemplateIS, filler);
- String activatorFileName = getActivatorName();
- activatorFileName = activatorFileName.replaceAll("\\.", "\\\\") + ".java";
-
- File activatorFile = new File(srcDir, activatorFileName);
+ String activatorDirName = getSymbolicName().toString();
+ File activatorDir = new File(srcDir, activatorDirName);
+ File activatorFile = new File(activatorDir, OsgiProjectizerConstants.ACTIVATOR_NAME + ".java");
+
writeToFileCheck(newActivator, activatorFile);
}
Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/OsgiMiniProjectizer.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/OsgiMiniProjectizer.java?view=diff&rev=516218&r1=516217&r2=516218
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/OsgiMiniProjectizer.java (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/OsgiMiniProjectizer.java Thu Mar 8 15:01:05 2007
@@ -67,7 +67,8 @@
File routerEntriesDir = new File(_targetDirectory,OsgiProjectizerConstants.ROUTER_ENTRIES_DIR);
- createManifest(_targetDirectory, OsgiProjectizerConstants.OSGI_MANIFEST_FILE_RESOURCE, OsgiProjectizerConstants.OSGI_MANIFEST_FILE, getActivatorName());
+ String activatorName = getSymbolicName() + "." + OsgiProjectizerConstants.ACTIVATOR_NAME;
+ createManifest(_targetDirectory, OsgiProjectizerConstants.OSGI_MANIFEST_FILE_RESOURCE, OsgiProjectizerConstants.OSGI_MANIFEST_FILE, activatorName);
createConfigIni(_targetDirectory, OsgiProjectizerConstants.CONFIG_FILE_RESOURCE, OsgiProjectizerConstants.CONFIG_FILE);
@@ -90,20 +91,16 @@
copyStreamCheck(configIS, configFile);
}
- protected String getActivatorName() {
- return getSymbolicName() + "." + OsgiProjectizerConstants.ACTIVATOR_NAME;
- }
-
protected void createActivatorFile(File srcDir, String activatorFileResource) throws Exception {
InputStream activatorTemplateIS = FileUtils.loadFromContext(OsgiAxis2Projectizer.class, activatorFileResource);
Object[] filler = { getSymbolicName() };
String newActivator = loadString(activatorTemplateIS, filler);
-
- String activatorFileName = getActivatorName();
- activatorFileName = activatorFileName.replaceAll("\\.", "\\\\") + ".java";
-
- File activatorFile = new File(srcDir, activatorFileName);
+
+ String activatorDirName = getSymbolicName().toString();
+ File activatorDir = new File(srcDir, activatorDirName);
+ File activatorFile = new File(activatorDir, OsgiProjectizerConstants.ACTIVATOR_NAME + ".java");
+
writeToFileCheck(newActivator, activatorFile);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org