You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2005/09/01 06:27:11 UTC
svn commit: r265646 - in /geronimo/trunk/modules:
service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
servicemix-builder/src/java/org/apache/geronimo/servicemix/deployment/ServiceMixConfigBuilder.java
Author: djencks
Date: Wed Aug 31 21:27:06 2005
New Revision: 265646
URL: http://svn.apache.org/viewcvs?rev=265646&view=rev
Log:
fix a couple small compilation errors
Modified:
geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
geronimo/trunk/modules/servicemix-builder/src/java/org/apache/geronimo/servicemix/deployment/ServiceMixConfigBuilder.java
Modified: geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java?rev=265646&r1=265645&r2=265646&view=diff
==============================================================================
--- geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java (original)
+++ geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java Wed Aug 31 21:27:06 2005
@@ -146,15 +146,15 @@
}
public URI getConfigurationID(Object plan, JarFile module) throws IOException, DeploymentException {
- ConfigurationType configType = (ConfigurationType) plan;
- try {
- return new URI(configType.getConfigId());
- } catch (URISyntaxException e) {
- throw new DeploymentException("Invalid configId " + configType.getConfigId(), e);
- }
- }
+ ConfigurationType configType = (ConfigurationType) plan;
+ try {
+ return new URI(configType.getConfigId());
+ } catch (URISyntaxException e) {
+ throw new DeploymentException("Invalid configId " + configType.getConfigId(), e);
+ }
+ }
- public ConfigurationData buildConfiguration(Object plan, JarFile unused, File outfile) throws IOException, DeploymentException {
+ public ConfigurationData buildConfiguration(Object plan, JarFile unused, File outfile) throws IOException, DeploymentException {
ConfigurationType configType = (ConfigurationType) plan;
String domain = null;
String server = null;
@@ -191,11 +191,7 @@
}
DeploymentContext context = null;
- try {
- context = new DeploymentContext(outfile, configID, ConfigurationModuleType.SERVICE, parentID, domain, server, kernel);
- } catch (MalformedObjectNameException e) {
- throw new DeploymentException(e);
- }
+ context = new DeploymentContext(outfile, configID, ConfigurationModuleType.SERVICE, parentID, domain, server, kernel);
J2eeContext j2eeContext = new J2eeContextImpl(context.getDomain(), context.getServer(), NameFactory.NULL, NameFactory.J2EE_MODULE, configID.toString(), null, null);
DependencyType[] includes = configType.getIncludeArray();
@@ -224,7 +220,7 @@
URI parentURI = getDependencyURI(anImport);
uris.add(parentURI);
}
- URI[] parentID = (URI[])uris.toArray(new URI[uris.size()]);
+ URI[] parentID = (URI[]) uris.toArray(new URI[uris.size()]);
return parentID;
}
Modified: geronimo/trunk/modules/servicemix-builder/src/java/org/apache/geronimo/servicemix/deployment/ServiceMixConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/servicemix-builder/src/java/org/apache/geronimo/servicemix/deployment/ServiceMixConfigBuilder.java?rev=265646&r1=265645&r2=265646&view=diff
==============================================================================
--- geronimo/trunk/modules/servicemix-builder/src/java/org/apache/geronimo/servicemix/deployment/ServiceMixConfigBuilder.java (original)
+++ geronimo/trunk/modules/servicemix-builder/src/java/org/apache/geronimo/servicemix/deployment/ServiceMixConfigBuilder.java Wed Aug 31 21:27:06 2005
@@ -58,6 +58,7 @@
private String deploymentDependencies;
public static final GBeanInfo GBEAN_INFO;
+
static {
GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(ServiceMixConfigBuilder.class, NameFactory.CONFIG_BUILDER);
infoFactory.addInterface(ConfigurationBuilder.class);
@@ -106,12 +107,12 @@
}
return properties;
} catch (Exception e) {
- throw new DeploymentException("Could not load META-INF/jbi-geronimo.properties: "+e,e);
+ throw new DeploymentException("Could not load META-INF/jbi-geronimo.properties: " + e, e);
}
}
public URI getConfigurationID(Object plan, JarFile module) throws IOException, DeploymentException {
- Properties properties = (Properties)plan;
+ Properties properties = (Properties) plan;
try {
return new URI(properties.getProperty("configID"));
} catch (URISyntaxException e1) {
@@ -121,7 +122,7 @@
public ConfigurationData buildConfiguration(Object plan, JarFile module, File outfile) throws IOException, DeploymentException {
log.debug("Installing ServiceMix deployment.");
- Properties properties = (Properties)plan;
+ Properties properties = (Properties) plan;
URI[] parentID = defaultParentId;
URI configID;
@@ -132,11 +133,7 @@
}
DeploymentContext context = null;
- try {
- context = new DeploymentContext(outfile, configID, ConfigurationModuleType.SERVICE, parentID, null, null, kernel);
- } catch (MalformedObjectNameException e) {
- throw new DeploymentException(e);
- }
+ context = new DeploymentContext(outfile, configID, ConfigurationModuleType.SERVICE, parentID, null, null, kernel);
// Copy over all files.
for (Enumeration e = module.entries(); e.hasMoreElements();) {
@@ -154,18 +151,18 @@
context.addGBean(gbeanData);
} catch (MalformedObjectNameException e) {
- throw new DeploymentException("Invalid gbean name: "+e,e);
+ throw new DeploymentException("Invalid gbean name: " + e, e);
}
- if( deploymentDependencies!=null ) {
+ if (deploymentDependencies != null) {
String[] strings = deploymentDependencies.split("\\,");
for (int i = 0; i < strings.length; i++) {
strings[i] = strings[i].trim();
- if( strings[i].length()>0 ) {
+ if (strings[i].length() > 0) {
try {
- context.addDependency(new URI(strings[i]));
+ context.addDependency(new URI(strings[i]));
} catch (URISyntaxException e) {
- throw new DeploymentException("Invalid dependency URI: "+strings[i],e);
+ throw new DeploymentException("Invalid dependency URI: " + strings[i], e);
}
}
}
@@ -176,7 +173,7 @@
try {
configurationData.addClassPathLocation(new URI("."));
} catch (URISyntaxException e) {
- throw new DeploymentException("Could not set classpath: "+e,e);
+ throw new DeploymentException("Could not set classpath: " + e, e);
}
return configurationData;
}