geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vamsic...@apache.org
Subject svn commit: r560325 - in /geronimo/sandbox/tuscany-integration: geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/ miscellaneous/ modules/tuscany-http-geronimo/src/main/java/org/apache/tuscany/sca/http/geronimo/
Date Fri, 27 Jul 2007 17:27:30 GMT
Author: vamsic007
Date: Fri Jul 27 10:27:29 2007
New Revision: 560325

URL: http://svn.apache.org/viewvc?view=rev&rev=560325
Log:
Another hack when there are duplicate component names with in one contribution

Modified:
    geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedRuntimeGBean.java
    geronimo/sandbox/tuscany-integration/miscellaneous/tuscany-plugin-1.0.car
    geronimo/sandbox/tuscany-integration/modules/tuscany-http-geronimo/src/main/java/org/apache/tuscany/sca/http/geronimo/GeronimoServletHost.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?view=diff&rev=560325&r1=560324&r2=560325
==============================================================================
--- 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
Fri Jul 27 10:27:29 2007
@@ -92,7 +92,13 @@
                     if (artifact.getModel() instanceof Composite) {
                         Composite composite = (Composite)artifact.getModel();
                         for(Component component: composite.getComponents()) {
-                            eScaDomain.getDomainCompositeHelper().startComponent(eScaDomain.getDomainCompositeHelper().getComponent(component.getName()));
+                            try {
+                                // FIXME: Eliminate calling start component on already started
component which results in Exception
+                                eScaDomain.getDomainCompositeHelper().startComponent(eScaDomain.getDomainCompositeHelper().getComponent(component.getName()));
+                            } catch(Throwable t) {
+                                // TODO: Anything else but ignore ??
+                                Throwable cause = t.getCause();
+                            }
                             startedComponents.add(component.getName());
                             embeddedSCADomainRef.getAllComponentNames().add(component.getName());
                         }

Modified: geronimo/sandbox/tuscany-integration/miscellaneous/tuscany-plugin-1.0.car
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/miscellaneous/tuscany-plugin-1.0.car?view=diff&rev=560325&r1=560324&r2=560325
==============================================================================
Binary files - no diff available.

Modified: geronimo/sandbox/tuscany-integration/modules/tuscany-http-geronimo/src/main/java/org/apache/tuscany/sca/http/geronimo/GeronimoServletHost.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/modules/tuscany-http-geronimo/src/main/java/org/apache/tuscany/sca/http/geronimo/GeronimoServletHost.java?view=diff&rev=560325&r1=560324&r2=560325
==============================================================================
--- geronimo/sandbox/tuscany-integration/modules/tuscany-http-geronimo/src/main/java/org/apache/tuscany/sca/http/geronimo/GeronimoServletHost.java
(original)
+++ geronimo/sandbox/tuscany-integration/modules/tuscany-http-geronimo/src/main/java/org/apache/tuscany/sca/http/geronimo/GeronimoServletHost.java
Fri Jul 27 10:27:29 2007
@@ -141,7 +141,7 @@
         if(context.getName().equals("")) {
             context = new StandardContext();
             context.setDocBase(docext + contextPath);
-            context.setJ2EEApplication(JMX_APP_NAME);
+            context.setJ2EEApplication(JMX_APP_NAME); // FIXME: Different name
             context.setJ2EEServer(JMX_SERVER_NAME);
             context.setPath(contextPath);        
             context.setName(contextPath);



Mime
View raw message