geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ivan <xhh...@gmail.com>
Subject Re: svn commit: r1149223 - /geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java
Date Fri, 22 Jul 2011 04:16:25 GMT
Thanks, Shawn.

2011/7/22 Shawn Jiang <genspring@gmail.com>

> Hi Ivan,
>
> I revert this because it's blocking uddi-tomcat build.   the repositories
> passed to jaxwstool is empty so that the tool can't find these artifacts in
> classpath.
>
>
> On Thu, Jul 21, 2011 at 11:28 PM, <xuhaihong@apache.org> wrote:
>
>> Author: xuhaihong
>> Date: Thu Jul 21 15:28:51 2011
>> New Revision: 1149223
>>
>> URL: http://svn.apache.org/viewvc?rev=1149223&view=rev
>> Log:
>> GERONIMO-6092 Unwanted application client entry is added in config.xml
>> file
>>
>> Modified:
>>
>>  geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java
>>
>> Modified:
>> geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java
>> URL:
>> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java?rev=1149223&r1=1149222&r2=1149223&view=diff
>>
>> ==============================================================================
>> ---
>> geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java
>> (original)
>> +++
>> geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java
>> Thu Jul 21 15:28:51 2011
>> @@ -68,8 +68,6 @@ import org.apache.geronimo.kernel.reposi
>>  import org.apache.geronimo.kernel.repository.Dependency;
>>  import org.apache.geronimo.kernel.repository.Environment;
>>  import org.apache.geronimo.kernel.repository.Repository;
>> -import org.apache.geronimo.kernel.util.FileUtils;
>> -import org.apache.geronimo.kernel.util.JarUtils;
>>  import org.apache.geronimo.system.plugin.model.ArtifactType;
>>  import org.apache.geronimo.system.plugin.model.DependencyType;
>>  import org.apache.geronimo.system.plugin.model.PluginArtifactType;
>> @@ -105,7 +103,7 @@ public class DeploymentContext {
>>     private final BundleContext bundleContext;
>>     protected Configuration configuration;
>>     private Bundle tempBundle;
>> -    private File tempBundleFile;
>> +    //private File tempBundleFile;
>>
>>
>>     public DeploymentContext(File baseDir,
>> @@ -146,7 +144,7 @@ public class DeploymentContext {
>>         this.naming = naming;
>>         this.moduleType = moduleType;
>>         this.environment = environment;
>> -        this.configurationManager = configurationManager;
>> +        this.configurationManager =
>> createConfigurationManager(configurationManager, Collections.<Repository>
>> emptyList(), bundleContext);
>>         this.bundleContext = bundleContext;
>>
>>         if (null == inPlaceConfigurationDir) {
>> @@ -175,12 +173,15 @@ public class DeploymentContext {
>>         this.naming = naming;
>>         this.moduleType = moduleType;
>>         this.environment = environment;
>> -        this.configurationManager = configurationManager;
>> +        this.configurationManager =
>> createConfigurationManager(configurationManager, Collections.<Repository>
>> emptyList(), bundleContext);
>>         this.resourceContext = resourceContext;
>>         this.bundleContext = bundleContext;
>>     }
>>
>>     private static ConfigurationManager
>> createConfigurationManager(ConfigurationManager configurationManager,
>> Collection<Repository> repositories, BundleContext bundleContext) {
>> +        if(configurationManager instanceof
>> DeploymentConfigurationManager) {
>> +            return configurationManager;
>> +        }
>>         return new DeploymentConfigurationManager(configurationManager,
>> repositories, bundleContext);
>>     }
>>
>> @@ -196,11 +197,11 @@ public class DeploymentContext {
>>         LinkedHashSet<Artifact> resolvedParentIds = null;
>>         try {
>>             ConfigurationData configurationData = new
>> ConfigurationData(moduleType, null, childConfigurationDatas, environment,
>> baseDir, inPlaceConfigurationDir, naming);
>> -            tempBundleFile = FileUtils.createTempFile();
>> +            //tempBundleFile = FileUtils.createTempFile();
>>             createTempManifest();
>>             createPluginMetadata();
>> -            JarUtils.jarDirectory(this.getConfigurationDir(),
>> tempBundleFile);
>> -            String location = "reference:" +
>> tempBundleFile.toURI().toURL();
>> +            //JarUtils.jarDirectory(this.getConfigurationDir(),
>> tempBundleFile);
>> +            String location = "reference:" +
>> this.getConfigurationDir().toURI().toURL();
>>             tempBundle = bundleContext.installBundle(location);
>>             if (BundleUtils.canStart(tempBundle)) {
>>                 tempBundle.start(Bundle.START_TRANSIENT);
>> @@ -522,12 +523,12 @@ public class DeploymentContext {
>>             } catch (BundleException e) {
>>             }
>>         }
>> -        if (tempBundleFile != null) {
>> +        /*if (tempBundleFile != null) {
>>             try {
>>                 tempBundleFile.delete();
>>             } catch (Exception e) {
>>             }
>> -        }
>> +        }*/
>>     }
>>
>>     public void addChildConfiguration(String moduleName, ConfigurationData
>> configurationData) {
>>
>>
>>
>
>
> --
> Shawn
>



-- 
Ivan

Mime
View raw message