[EMAIL PROTECTED] wrote:
Author: ammulder
Date: Sat Apr 15 23:35:09 2006
New Revision: 394439
URL: http://svn.apache.org/viewcvs?rev=394439&view=rev
Log:
Services can be deployed with a JAR and plan, or a plan in the JAR at
META-INF/geronimo-service.xml (GERONIMO-1859)
Improvements to configuration import/export, including more metadata
and no installations just to gather metadata
Improved handling for Artifacts that are missing parts (effectively
wildcards)
<snip>
Modified:
geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
URL:
http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java?rev=394439&r1=394438&r2=394439&view=diff
==============================================================================
---
geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
(original)
+++
geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
Sat Apr 15 23:35:09 2006
@@ -27,12 +27,15 @@
<snip>
DeploymentContext context = new DeploymentContext(outfile,
null,environment, ConfigurationModuleType.SERVICE, naming, repositories,
configurationStores);
+ if(jar != null) {
+ if(inPlaceDeployment) {
+ //todo: add the JAR to the configuration Class Path and do
whatever else we need to (may need to set in-place directory on the
DeploymentContext just above?)
+ throw new UnsupportedOperationException("In-place deployments are
not supported yet for services");
+ } else {
+ File file = new File(jar.getName());
+ context.addIncludeAsPackedJar(URI.create(file.getName()), jar);
+ }
+ }
try {
ClassLoader cl = context.getClassLoader();
I have refactored DeploymentContext to easily add support for in-place
deployment of services (in a few words InPlaceEARContext has been
removed and DeploymentContext delegates to two distinct strategies).
Aaron, if you plan to work on in-place deployment of services, then I
think that I will get to that tomorrow during the day - so, if you can
wait until then...
Thanks,
Gianny
