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 ae...@apache.org on 2007/03/04 17:58:25 UTC
svn commit: r514434 - in /webservices/muse/trunk/modules/muse-tools:
resources/osgi/ src/org/apache/muse/tools/generator/
src/org/apache/muse/tools/generator/projectizer/
src/org/apache/muse/tools/generator/synthesizer/
src/org/apache/muse/tools/genera...
Author: aeberbac
Date: Sun Mar 4 08:58:23 2007
New Revision: 514434
URL: http://svn.apache.org/viewvc?view=rev&rev=514434
Log:
MUSE-199: Added support for the mini soap enginge projectizer for osgi.
Added:
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/OsgiAxis2ProjectizerConstants.java
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/OsgiMiniProjectizerConstants.java
Removed:
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/Axis2Projectizer.java
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/OsgiProjectizer.java
Modified:
webservices/muse/trunk/modules/muse-tools/resources/osgi/MANIFEST.MF
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Messages.properties
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Wsdl2Java.java
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Wsdl2JavaConstants.java
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/AbstractProjectizer.java
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/J2EEAxis2Projectizer.java
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
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/OsgiProjectizerConstants.java
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/Messages.properties
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ServerClassSynthesizer.java
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/SubscriptionManagerHelper.java
Modified: webservices/muse/trunk/modules/muse-tools/resources/osgi/MANIFEST.MF
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/resources/osgi/MANIFEST.MF?view=diff&rev=514434&r1=514433&r2=514434
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/resources/osgi/MANIFEST.MF (original)
+++ webservices/muse/trunk/modules/muse-tools/resources/osgi/MANIFEST.MF Sun Mar 4 08:58:23 2007
@@ -8,7 +8,6 @@
Import-Package: javax.xml.namespace,
org.osgi.framework;version="1.3.0"
Require-Bundle: muse.osgi.core,
- muse.osgi.soa.axis2,
muse.osgi.soa.core,
muse.core,
muse.util.all,
@@ -26,7 +25,6 @@
muse.wsrf.rmd,
muse.wsx.api,
muse.wsx.impl,
- org.eclipse.corona.soa.provider.Axis2,
org.eclipse.equinox.http,
org.eclipse.equinox.servlet.api,
org.eclipse.osgi.services,
Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Messages.properties
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Messages.properties?view=diff&rev=514434&r1=514433&r2=514434
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Messages.properties (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Messages.properties Sun Mar 4 08:58:23 2007
@@ -4,24 +4,37 @@
DescriptorNotFound = The descriptor XXX could not be found. Please check to make sure the path is correct.
DoesNotImplement = The class XXX does not implement the expected interface XXX.
ExistingFound = The file XXX exists. To force it to be overwritten use XXX.
+InvalidArgs = The arguments passed to wsdl2java are not valid. Please rerun with XXX.
FailedLoadingBuiltinDescriptor = Could not load the built-in descriptor. This is a problem with your classpath and/or muse-tools.jar, try replacing it with a clean version.
FailedLoadingDescriptor = Failed loading descriptor with error: XXX.
-Wsdl2JavaHelp = Usage: wsdl2java.[bat|sh] XXX FILE [OPTIONS]\n\n\
+Wsdl2JavaHelp = Usage: wsdl2java.[bat|sh] PLATFORM [CONTAINER] XXX FILE [OPTIONS]\n\n\
The following arguments are required:\n\
\ \ XXX FILE\t\tThe WSDL definition file to analyze\n\n\
-\
+\ \ PLATFORM\t\tMust be one of the following:\n\
+\ \ \ \ XXX\t\tCreate a J2EE project\n\
+\ \ \ \ XXX\t\tCreate a OSGi project\n\
+\ \ \ \ XXX\t\tCreate a Proxy project\n\n\
+\ \ CONTAINER\t\tSpecify one of the following for J2EE or OSGi:\n\
+\ \ \ \ XXX\t\tCreate a Axis2 1.1 container\n\
+\ \ \ \ XXX\t\tCreate a Mini SOAP Engine container\n\n\
The following arguments are optional:\n\
\ \ XXX DIR\t\tSpecify an output direcgtory\n\
\ \ XXX\t\tOverwrite files that exist\n\
\ \ XXX\t\t\tDisplay this message\n\
-\ \ XXX\t\tDisplay more advanced help message\n
+\ \ XXX\t\tDisplay more advanced help message
Wsdl2JavaHelpAdvanced =Usage (one of the following):\n\n\
-wsdl2java.[bat|sh] XXX FILE [OPTIONS]\n\n\
-wsdl2java.[bat|sh] XXX FILE [OPTIONS]\n\n\
+wsdl2java.[bat|sh] PLATFORM [CONTAINER] XXX FILE [OPTIONS]\n\n\
+wsdl2java.[bat|sh] PLATFORM [CONTAINER] XXX FILE [OPTIONS]\n\n\
One of the following arguments is required:\n\
\ \ XXX FILE\t\tThe WSDL definition file to analyze\n\
\ \ XXX FILE\tThe Muse descriptor to use\n\n\
-\
+\ \ PLATFORM\t\tMust be one of the following:\n\
+\ \ \ \ XXX\t\tCreate a J2EE project\n\
+\ \ \ \ XXX\t\tCreate a OSGi project\n\
+\ \ \ \ XXX\t\tCreate a Proxy project\n\n\
+\ \ CONTAINER\t\tSpecify one of the following for J2EE or OSGi:\n\
+\ \ \ \ XXX\t\tCreate a Axis2 1.1 container\n\
+\ \ \ \ XXX\t\tCreate a Mini SOAP Engine container\n\n\
The following arguments are optional:\n\
\ \ XXX DIR\t\tSpecify an output direcgtory\n\
\ \ XXX\t\tOverwrite files that exist\n\
@@ -29,16 +42,12 @@
\ \ XXX CLASS\tThe Synthesizer component\n\
\ \ XXX CLASS\tThe Projectizer component\n\
\ \ XXX FILE\t\tDump the built-in descriptor to a file\n\
-\ \ XXX\t\tGenerate an Axis2 project\n\
-\ \ XXX\t\t\tGenerate an OSGi project\n\
-\ \ XXX\t\t\tGenerate a Mini SOAP Engine project\n\
-\ \ XXX\t\tGenerate a proxy project\n\
\ \ XXX\t\tGenerate a custom headers parameter in operations\n\
\ \ XXX\t\tTurn off all messages\n\
\ \ XXX\t\tTurn on verbose output\n\
\ \ XXX\t\tPrint out the version\n\
\ \ XXX\t\t\tDisplay a simple help message\n\
-\ \ XXX\t\tDisplay this message\n
+\ \ XXX\t\tDisplay this message
InstantiateFailed = Could not instantiate class: XXX. See exception information below.
NoBaseDescriptorOutput = No target descriptor was specified with the XXX flag.
NoWSDLFlag = A WSDL descriptor must be specified using the XXX flag.
Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Wsdl2Java.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Wsdl2Java.java?view=diff&rev=514434&r1=514433&r2=514434
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Wsdl2Java.java (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Wsdl2Java.java Sun Mar 4 08:58:23 2007
@@ -32,6 +32,7 @@
import org.apache.muse.tools.generator.synthesizer.Synthesizer;
import org.apache.muse.tools.generator.util.AbstractCommandLineApp;
import org.apache.muse.tools.generator.util.ConfigurationData;
+import org.apache.muse.tools.generator.util.MuseRuntimeException;
import org.apache.muse.tools.generator.util.WsdlEnvironment;
import org.apache.muse.util.CommandLine;
import org.apache.muse.util.FileUtils;
@@ -351,14 +352,17 @@
DESCRIPTOR_FLAG,
WSDL_DEFINITION_FLAG,
DESCRIPTOR_FLAG,
+ J2EE_FLAG,
+ OSGI_FLAG,
+ PROXY_FLAG,
+ AXIS2_TYPE,
+ MINI_TYPE,
OUTPUT_FLAG,
OVERWRITE_FLAG,
ANALYZER_FLAG,
SYNTHESIZER_FLAG,
PROJECTIZER_FLAG,
BASE_DESCRIPTOR_FLAG,
- OSGI_FLAG,
- PROXY_FLAG,
HEADERS_FLAG,
QUIET_FLAG,
VERBOSE_FLAG,
@@ -374,6 +378,11 @@
Object filler[] = new Object[] {
WSDL_DEFINITION_FLAG,
WSDL_DEFINITION_FLAG,
+ J2EE_FLAG,
+ OSGI_FLAG,
+ PROXY_FLAG,
+ AXIS2_TYPE,
+ MINI_TYPE,
OUTPUT_FLAG,
OVERWRITE_FLAG,
HELP_FLAG,
@@ -549,8 +558,6 @@
* @see Projectizer
*/
private static Projectizer checkProjectizerArg(CommandLine arguments) {
- Projectizer projectizer = null;
-
if (arguments.hasFlag(PROXY_FLAG)) {
return new ProxyProjectizer();
}
@@ -558,26 +565,30 @@
if(arguments.hasFlag(J2EE_FLAG)) {
String type = arguments.getFlagValue(J2EE_FLAG);
if(type == null) {
- throw new RuntimeException();
+ Object[] filler = { HELP_FLAG };
+ throw new MuseRuntimeException("InvalidArgs",_MESSAGES.get("InvalidArgs", filler));
} else if(type.equals(MINI_TYPE)) {
return new J2EEMiniProjectizer();
} else if(type.equals(AXIS2_TYPE)){
return new J2EEAxis2Projectizer();
} else {
- throw new RuntimeException();
+ Object[] filler = { HELP_FLAG };
+ throw new MuseRuntimeException("InvalidArgs",_MESSAGES.get("InvalidArgs", filler));
}
}
if(arguments.hasFlag(OSGI_FLAG)) {
String type = arguments.getFlagValue(OSGI_FLAG);
if(type == null) {
- throw new RuntimeException();
+ Object[] filler = { HELP_FLAG };
+ throw new MuseRuntimeException("InvalidArgs",_MESSAGES.get("InvalidArgs", filler));
} else if(type.equals(MINI_TYPE)) {
return new OsgiMiniProjectizer();
} else if(type.equals(AXIS2_TYPE)){
return new OsgiAxis2Projectizer();
} else {
- throw new RuntimeException();
+ Object[] filler = { HELP_FLAG };
+ throw new MuseRuntimeException("InvalidArgs",_MESSAGES.get("InvalidArgs", filler));
}
}
@@ -589,10 +600,11 @@
handleErrorAndExit(_MESSAGES.get("NullProjectizer", filler));
}
- projectizer = (Projectizer) loadClass(arguments.getFlagValue(PROJECTIZER_FLAG), Projectizer.class);
+ return (Projectizer) loadClass(arguments.getFlagValue(PROJECTIZER_FLAG), Projectizer.class);
}
- return projectizer;
+ Object[] filler = { HELP_FLAG };
+ throw new MuseRuntimeException("InvalidArgs",_MESSAGES.get("InvalidArgs", filler));
}
/**
Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Wsdl2JavaConstants.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Wsdl2JavaConstants.java?view=diff&rev=514434&r1=514433&r2=514434
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Wsdl2JavaConstants.java (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/Wsdl2JavaConstants.java Sun Mar 4 08:58:23 2007
@@ -52,7 +52,7 @@
String OSGI_FLAG = "-osgi";
- String MINI_TYPE = " mini";
+ String MINI_TYPE = "mini";
String AXIS2_TYPE = "axis2";
Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/AbstractProjectizer.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/AbstractProjectizer.java?view=diff&rev=514434&r1=514433&r2=514434
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/AbstractProjectizer.java (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/AbstractProjectizer.java Sun Mar 4 08:58:23 2007
@@ -18,6 +18,7 @@
import java.io.BufferedReader;
import java.io.File;
+import java.io.FileFilter;
import java.io.FileNotFoundException;
import java.io.FileWriter;
import java.io.IOException;
@@ -222,7 +223,6 @@
copyTemplate(files[i], destination);
} else {
copyFileCheck(files[i], destination);
-
}
}
}
@@ -372,6 +372,10 @@
* If anything goes wrong
*/
protected void copyJars(String[] moduleNames, File baseModulesDir, File destDir) throws Exception {
+ copyJars(moduleNames, baseModulesDir, destDir, null);
+ }
+
+ protected void copyJars(String[] moduleNames, File baseModulesDir, File destDir, FileFilter filter) throws Exception {
if(!baseModulesDir.exists()) {
throw new FileNotFoundException();
}
Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/J2EEAxis2Projectizer.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/J2EEAxis2Projectizer.java?view=diff&rev=514434&r1=514433&r2=514434
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/J2EEAxis2Projectizer.java (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/J2EEAxis2Projectizer.java Sun Mar 4 08:58:23 2007
@@ -76,7 +76,7 @@
protected Set[] _ignoreSets;
- private MetadataDescriptor[] _metadatas;
+ protected MetadataDescriptor[] _metadatas;
public void projectize(ConfigurationData configuration) throws Exception {
ConfigurationData.checkConfiguration(this, configuration);
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=514434&r1=514433&r2=514434
==============================================================================
--- 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 Sun Mar 4 08:58:23 2007
@@ -23,6 +23,7 @@
import org.apache.muse.tools.generator.util.ConfigurationData;
import org.apache.muse.tools.generator.util.ConfigurationDataDescriptor;
import org.apache.muse.util.FileUtils;
+import org.apache.muse.ws.resource.metadata.MetadataDescriptor;
import org.apache.muse.ws.wsdl.WsdlUtils;
import org.w3c.dom.Document;
@@ -78,6 +79,9 @@
for(int i=0; i < _capabilitiesList.length; i++) {
Map capabilities = _capabilitiesList[i];
+ MetadataDescriptor rmd = _metadatas[i];
+
+ createRMDFile(rmd, _wsdls[i], wsdldir);
Document wsdl = _wsdls[i];
createDescriptor(_descriptor, wsdl, descriptorFile, capabilities, Axis2ProjectizerConstants.WSDL_RELATIVE_PATH, i);
createWSDLFile(wsdl, wsdldir);
@@ -89,9 +93,12 @@
File templateDir = new File(System.getProperty(Axis2ProjectizerConstants.MUSE_HOME_PROPERTY), OsgiProjectizerConstants.TEMPLATE_DIR);
File destDir = new File(_targetDirectory, OsgiProjectizerConstants.PLUGINS_DIR);
copyTemplate(templateDir, destDir);
-
+
+ File axis2ExtraJars = new File(System.getProperty(Axis2ProjectizerConstants.MUSE_HOME_PROPERTY), OsgiAxis2ProjectizerConstants.AXIS2_EXTRA_JARS);
+ copyTemplate(axis2ExtraJars, destDir);
+
File modulesDir = new File(System.getProperty(Axis2ProjectizerConstants.MUSE_HOME_PROPERTY),OsgiProjectizerConstants.MODULES_DIR);
- copyJars(OsgiProjectizerConstants.REQUIRED_MODULES, modulesDir, destDir);
+ copyJars(OsgiAxis2ProjectizerConstants.REQUIRED_MODULES, modulesDir, destDir);
File libDir = new File(_targetDirectory, OsgiProjectizerConstants.LIB_DIR);
copyJars(OsgiProjectizerConstants.REQUIRED_LIBS, modulesDir, libDir);
Added: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/OsgiAxis2ProjectizerConstants.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/OsgiAxis2ProjectizerConstants.java?view=auto&rev=514434
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/OsgiAxis2ProjectizerConstants.java (added)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/OsgiAxis2ProjectizerConstants.java Sun Mar 4 08:58:23 2007
@@ -0,0 +1,8 @@
+package org.apache.muse.tools.generator.projectizer;
+
+public interface OsgiAxis2ProjectizerConstants {
+
+ String AXIS2_EXTRA_JARS = "lib/axis2-osgi";
+
+ String[] REQUIRED_MODULES = { "osgi/core", "osgi/ws-fx-api", "osgi/ws-fx-impl", "osgi/axis2"};
+}
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=514434&r1=514433&r2=514434
==============================================================================
--- 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 Sun Mar 4 08:58:23 2007
@@ -1,18 +1,110 @@
package org.apache.muse.tools.generator.projectizer;
+import java.io.File;
+import java.io.InputStream;
+import java.util.Map;
+
import org.apache.muse.tools.generator.util.ConfigurationData;
-import org.apache.muse.tools.generator.util.ConfigurationDataDescriptor;
+import org.apache.muse.util.FileUtils;
+import org.apache.muse.ws.resource.metadata.MetadataDescriptor;
+import org.apache.muse.ws.wsdl.WsdlUtils;
+import org.w3c.dom.Document;
public class OsgiMiniProjectizer extends J2EEMiniProjectizer {
- public void projectize(ConfigurationData data) throws Exception {
- // TODO Auto-generated method stub
+ public void projectize(ConfigurationData configuration) throws Exception {
+ ConfigurationData.checkConfiguration(this, configuration);
+
+ loadParameters(configuration);
+
+ File javaSourceDir = new File(
+ _targetDirectory,
+ OsgiProjectizerConstants.JAVA_SRC_DIR);
+
+ createDirectoryStructure();
+ createJavaSources(javaSourceDir, _filesMaps, _ignoreSets);
+ createArtifacts(javaSourceDir);
+
+ createOverwriteManifest();
+ }
+
+ protected void createDirectoryStructure() throws Exception {
+ File templateDir = new File(System.getProperty(Axis2ProjectizerConstants.MUSE_HOME_PROPERTY), OsgiProjectizerConstants.TEMPLATE_DIR);
+ File destDir = new File(_targetDirectory, OsgiProjectizerConstants.PLUGINS_DIR);
+ copyTemplate(templateDir, destDir);
+
+ File modulesDir = new File(System.getProperty(Axis2ProjectizerConstants.MUSE_HOME_PROPERTY),OsgiProjectizerConstants.MODULES_DIR);
+ copyJars(OsgiMiniProjectizerConstants.REQUIRED_MODULES, modulesDir, destDir);
+
+ File libDir = new File(_targetDirectory, OsgiProjectizerConstants.LIB_DIR);
+ copyJars(OsgiProjectizerConstants.REQUIRED_LIBS, modulesDir, libDir);
+ }
+
+ protected void createArtifacts(File javaSourceDir) throws Exception {
+ File descriptorFile = new File(_targetDirectory, OsgiProjectizerConstants.MUSE_DESCRIPTOR_FILE);
+
+ createFileFromResource(_targetDirectory, OsgiProjectizerConstants.BUILD_FILE_RESOURCE, MiniProjectizerConstants.BUILD_FILE);
+ File wsdldir = new File(_targetDirectory, OsgiProjectizerConstants.WSDL_DIR);
+
+ 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());
+
+ createConfigIni(_targetDirectory, OsgiProjectizerConstants.CONFIG_FILE_RESOURCE, OsgiProjectizerConstants.CONFIG_FILE);
+
+ for(int i=0; i < _capabilitiesList.length; i++) {
+ Map capabilities = _capabilitiesList[i];
+ Document wsdl = _wsdls[i];
+ MetadataDescriptor rmd = _metadatas[i];
+
+ createRMDFile(rmd, wsdl, wsdldir);
+ createDescriptor(_descriptor, wsdl, descriptorFile, capabilities, Axis2ProjectizerConstants.WSDL_RELATIVE_PATH, i);
+ createWSDLFile(wsdl, wsdldir);
+ createRouterEntries(routerEntriesDir, WsdlUtils.getServiceName(wsdl.getDocumentElement()), capabilities);
+ }
+ }
+
+ protected void createConfigIni(File destDir, String configFileResource, String configFileName) throws Exception {
+ InputStream configIS = FileUtils.loadFromContext(OsgiAxis2Projectizer.class,configFileResource );
+
+ File configFile = new File(destDir, configFileName);
+ copyStreamCheck(configIS, configFile);
}
- public ConfigurationDataDescriptor[] getConfigurationDataDescriptions() {
- // TODO Auto-generated method stub
- return null;
+ 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);
+ writeToFileCheck(newActivator, activatorFile);
+ }
+
+ protected void createManifest(File baseTargetDir, String manifestFileResource, String manifestFileName, String activatorFileName) throws Exception {
+ InputStream manifestTemplateIS = FileUtils.loadFromContext(OsgiAxis2Projectizer.class ,manifestFileResource);
+
+ Object[] filler = { getSymbolicName(), activatorFileName, getSymbolicName(), getSymbolicName() };
+ String newManifest = loadString(manifestTemplateIS, filler);
+
+ File manifestFile = new File(baseTargetDir, manifestFileName);
+ writeToFileCheck(newManifest, manifestFile);
+ }
+
+ protected Object getSymbolicName() {
+ if(_targetDirectory.equals(FileUtils.CURRENT_DIR)) {
+ return _targetDirectory.getAbsoluteFile().getParentFile().getName();
+ }
+ return _targetDirectory.getAbsoluteFile().getName();
+ }
}
Added: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/OsgiMiniProjectizerConstants.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/OsgiMiniProjectizerConstants.java?view=auto&rev=514434
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/OsgiMiniProjectizerConstants.java (added)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/OsgiMiniProjectizerConstants.java Sun Mar 4 08:58:23 2007
@@ -0,0 +1,7 @@
+package org.apache.muse.tools.generator.projectizer;
+
+public interface OsgiMiniProjectizerConstants {
+
+ String[] REQUIRED_MODULES = { "osgi/core", "osgi/ws-fx-api", "osgi/ws-fx-impl", "osgi/mini"};
+
+}
Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/OsgiProjectizerConstants.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/OsgiProjectizerConstants.java?view=diff&rev=514434&r1=514433&r2=514434
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/OsgiProjectizerConstants.java (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/projectizer/OsgiProjectizerConstants.java Sun Mar 4 08:58:23 2007
@@ -55,9 +55,7 @@
String ROUTER_ENTRIES_DIR = "router-entries";
String MODULES_DIR = "modules";
-
- String[] REQUIRED_MODULES = { "osgi/core", "osgi/ws-fx-api", "osgi/ws-fx-impl"};
-
+
String LIB_DIR = "lib";
String[] REQUIRED_LIBS = { "core", "ws-fx-api", "ws-fx-impl"};
Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/Messages.properties
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/Messages.properties?view=diff&rev=514434&r1=514433&r2=514434
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/Messages.properties (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/Messages.properties Sun Mar 4 08:58:23 2007
@@ -1,3 +1,4 @@
InitTODO=TODO perform intitialization of the following non-primitive properties
InitThrow=User needs to update initialization code
-InitEmptyTODO=TODO Perform any needed initialization for this empty capability
\ No newline at end of file
+InitEmptyTODO=TODO Perform any needed initialization for this empty capability
+InitializeComment=The following call is necessary to property initialize the resource
\ No newline at end of file
Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ServerClassSynthesizer.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ServerClassSynthesizer.java?view=diff&rev=514434&r1=514433&r2=514434
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ServerClassSynthesizer.java (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ServerClassSynthesizer.java Sun Mar 4 08:58:23 2007
@@ -53,7 +53,7 @@
}
classInfo.addImports(_importSet);
-
+ capability.setImplementingClass(className);
String classFileName = createFileName(className);
files.put(classFileName, generateCombinedCode(classInfo));
ignoreSet.add(new File(classFileName));
@@ -154,9 +154,31 @@
generatePropertyInitTodo(classInfo, code);
}
+ generateSuperInitialize(code);
+
indent(code);
generateCloseBlock(code);
newLine(2, code);
+ }
+
+ private void generateSuperInitialize(StringBuffer code) {
+ newLine(code);
+
+ indent(2, code);
+ code.append("//");
+ newLine(code);
+
+ indent(2, code);
+ code.append("//" +_MESSAGES.get("InitializeComment", false));
+ newLine(code);
+
+ indent(2, code);
+ code.append("//");
+ newLine(code);
+
+ indent(2, code);
+ code.append("super.initialize();");
+ newLine(code);
}
protected void generateEmptyInitTodo(StringBuffer code) {
Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/SubscriptionManagerHelper.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/SubscriptionManagerHelper.java?view=diff&rev=514434&r1=514433&r2=514434
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/SubscriptionManagerHelper.java (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/SubscriptionManagerHelper.java Sun Mar 4 08:58:23 2007
@@ -17,20 +17,19 @@
package org.apache.muse.tools.generator.util;
import java.io.InputStream;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import java.util.HashMap;
import org.apache.muse.util.FileUtils;
import org.apache.muse.util.xml.XmlUtils;
+import org.apache.muse.ws.notification.WsnConstants;
+import org.apache.muse.ws.notification.impl.SimpleSubscriptionManager;
import org.apache.muse.ws.resource.lifetime.WsrlConstants;
import org.apache.muse.ws.resource.lifetime.impl.SimpleImmediateTermination;
import org.apache.muse.ws.resource.lifetime.impl.SimpleScheduledTermination;
import org.apache.muse.ws.resource.properties.WsrpConstants;
import org.apache.muse.ws.resource.properties.get.impl.SimpleGetCapability;
-import org.apache.muse.ws.notification.SubscriptionManager;
-import org.apache.muse.ws.notification.impl.SimpleSubscriptionManager;
-import org.apache.muse.ws.notification.WsnConstants;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org