You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by va...@apache.org on 2007/08/21 12:07:20 UTC
svn commit: r568048 - in
/geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany:
EmbeddedRuntimeGBean.java EmbeddedSCADomainGBean.java SCADomainHelper.java
TuscanyBuilder.java
Author: vamsic007
Date: Tue Aug 21 03:07:16 2007
New Revision: 568048
URL: http://svn.apache.org/viewvc?rev=568048&view=rev
Log:
Cleanup
Modified:
geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedRuntimeGBean.java
geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedSCADomainGBean.java
geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/SCADomainHelper.java
geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/TuscanyBuilder.java
Modified: geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedRuntimeGBean.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedRuntimeGBean.java?rev=568048&r1=568047&r2=568048&view=diff
==============================================================================
--- geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedRuntimeGBean.java (original)
+++ geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedRuntimeGBean.java Tue Aug 21 03:07:16 2007
@@ -22,6 +22,8 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
@@ -37,6 +39,8 @@
public class EmbeddedRuntimeGBean implements GBeanLifecycle, SCADomainInterface {
+ private final static Log log = LogFactory.getLog(EmbeddedRuntimeGBean.class);
+
private ClassLoader classLoader;
private EmbeddedSCADomainGBean embeddedSCADomainRef;
private boolean useEmbeddedDomain = true;
Modified: geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedSCADomainGBean.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedSCADomainGBean.java?rev=568048&r1=568047&r2=568048&view=diff
==============================================================================
--- geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedSCADomainGBean.java (original)
+++ geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedSCADomainGBean.java Tue Aug 21 03:07:16 2007
@@ -18,9 +18,8 @@
*/
package org.apache.geronimo.tuscany;
-import java.util.ArrayList;
-import java.util.List;
-
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
@@ -30,12 +29,12 @@
import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
public class EmbeddedSCADomainGBean implements GBeanLifecycle, SCADomainInterface{
+ private final static Log log = LogFactory.getLog(EmbeddedSCADomainGBean.class);
private AbstractName abstractName;
private EmbeddedSCADomain scaDomain;
private String domainUri;
private ClassLoader runtimeClassLoader;
- private List<String> allComponentNames; // TODO: Remove when EmbeddedSCADomain can return all component names in the domain
public EmbeddedSCADomainGBean(AbstractName abstractName, ClassLoader runtimeClassLoader, String domainUri) {
this.abstractName = abstractName;
@@ -52,17 +51,13 @@
}
public void doStart() throws Exception {
- // TODO Auto-generated method stub
scaDomain = new EmbeddedSCADomain(runtimeClassLoader, domainUri);
scaDomain.start();
- allComponentNames = new ArrayList<String>();
}
public void doStop() throws Exception {
- // TODO Auto-generated method stub
scaDomain.stop();
scaDomain = null;
- allComponentNames = null;
}
public SCADomain getScaDomain() {
@@ -83,9 +78,5 @@
public static GBeanInfo getGBeanInfo() {
return GBEAN_INFO;
- }
-
- public List<String> getAllComponentNames() {
- return allComponentNames;
}
}
Modified: geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/SCADomainHelper.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/SCADomainHelper.java?rev=568048&r1=568047&r2=568048&view=diff
==============================================================================
--- geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/SCADomainHelper.java (original)
+++ geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/SCADomainHelper.java Tue Aug 21 03:07:16 2007
@@ -32,6 +32,8 @@
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.system.serverinfo.ServerInfo;
@@ -41,6 +43,7 @@
* Utility class to initialize the SCADomain associated with a Module
*/
public class SCADomainHelper {
+ private final static Log log = LogFactory.getLog(SCADomainHelper.class);
/**
* Gets all the composites in the Application.
@@ -114,8 +117,7 @@
try {
jar = new JarFile(file);
} catch (IOException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
+ log.error("Problem finding SCDL file.", e1);
}
for (Enumeration<JarEntry> e = jar.entries(); e.hasMoreElements();) {
JarEntry entry = e.nextElement();
Modified: geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/TuscanyBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/TuscanyBuilder.java?rev=568048&r1=568047&r2=568048&view=diff
==============================================================================
--- geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/TuscanyBuilder.java (original)
+++ geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/TuscanyBuilder.java Tue Aug 21 03:07:16 2007
@@ -29,6 +29,8 @@
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.ConfigurationBuilder;
import org.apache.geronimo.deployment.DeploymentContext;
@@ -56,6 +58,7 @@
import org.apache.geronimo.kernel.repository.Repository;
public class TuscanyBuilder implements ConfigurationBuilder {
+ private final static Log log = LogFactory.getLog(TuscanyBuilder.class);
private final Environment defaultEnvironment;
private final Collection repositories;