You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/07/21 01:44:58 UTC
svn commit: r424129 - in
/geronimo/sandbox/svkmerge/m2migration/modules/system/src: ./
java/org/apache/geronimo/system/main/StartupMonitorUtil.java
schema/local-attributes-1.1.xsd
Author: jdillon
Date: Thu Jul 20 16:44:58 2006
New Revision: 424129
URL: http://svn.apache.org/viewvc?rev=424129&view=rev
Log:
r493@Bliss (orig r424119): jdillon | 2006-07-20 16:40:58 -0700
r473@Bliss (orig r424015): sppatel | 2006-07-20 11:23:38 -0700
GERONIMO-1492
Modified:
geronimo/sandbox/svkmerge/m2migration/modules/system/src/ (props changed)
geronimo/sandbox/svkmerge/m2migration/modules/system/src/java/org/apache/geronimo/system/main/StartupMonitorUtil.java
geronimo/sandbox/svkmerge/m2migration/modules/system/src/schema/local-attributes-1.1.xsd
Propchange: geronimo/sandbox/svkmerge/m2migration/modules/system/src/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Jul 20 16:44:58 2006
@@ -1 +1 @@
-13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/system/src:422569
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/system/src:424119
Modified: geronimo/sandbox/svkmerge/m2migration/modules/system/src/java/org/apache/geronimo/system/main/StartupMonitorUtil.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/system/src/java/org/apache/geronimo/system/main/StartupMonitorUtil.java?rev=424129&r1=424128&r2=424129&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/system/src/java/org/apache/geronimo/system/main/StartupMonitorUtil.java (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/system/src/java/org/apache/geronimo/system/main/StartupMonitorUtil.java Thu Jul 20 16:44:58 2006
@@ -218,7 +218,7 @@
String app = abstractName.getNameProperty("J2EEApplication");
String name = abstractName.getNameProperty("name");
if (type != null && (app == null || app.equals("null"))) {
- return (type.equals("WebModule") || type.equals("J2EEApplication") || type.equals("EJBModule") || type.equals("AppClientModule") || type.equals("ResourceAdapterModule")) && !name.startsWith("org/apache/geronimo/System");
+ return (type.equals("WebModule") || type.equals("J2EEApplication") || type.equals("EJBModule") || type.equals("AppClientModule") || type.equals("ResourceAdapterModule")) && !name.startsWith("geronimo/system");
}
return false;
}
Modified: geronimo/sandbox/svkmerge/m2migration/modules/system/src/schema/local-attributes-1.1.xsd
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/system/src/schema/local-attributes-1.1.xsd?rev=424129&r1=424128&r2=424129&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/system/src/schema/local-attributes-1.1.xsd (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/system/src/schema/local-attributes-1.1.xsd Thu Jul 20 16:44:58 2006
@@ -31,12 +31,12 @@
Should look like this:
<attributes>
- <configuration name="org/apache/geronimo/Server">
- <gbean name="SomeJettyConnector">
+ <module name="mygroup/mycomponent/1.1/jar">
+ <gbean name="MyNetworkService">
<attribute name="host">0.0.0.0</attribute>
- <attribute name="port">8080</attribute>
+ <attribute name="port">1234</attribute>
</gbean>
- </configuration>
+ </module>
</attributes>
]]>
</xsd:documentation>
@@ -72,7 +72,7 @@
Note that the name attribute for a gbean element may hold
either the full GBeanName, or only the value for the
"name=" portion of the GBeanName. If there are multiple
- GBeans in the configuration with manageable attributes and
+ GBeans in the module with manageable attributes and
the same "name=" portion of the GBeanName, then all must be
listed and all must be listed with a full GBeanName.
]]>
@@ -114,4 +114,4 @@
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string"/>
</xsd:complexType>
- </xsd:schema>
\ No newline at end of file
+ </xsd:schema>