You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2006/03/27 02:52:50 UTC
svn commit: r388996 [1/2] - in /geronimo/branches/1.1:
applications/console-core/src/java/org/apache/geronimo/console/core/security/
assemblies/j2ee-jetty-server/src/var/config/
assemblies/j2ee-tomcat-server/src/var/config/ configs/activemq-broker/src/...
Author: djencks
Date: Sun Mar 26 16:52:46 2006
New Revision: 388996
URL: http://svn.apache.org/viewcvs?rev=388996&view=rev
Log:
jetty and tomcat servers start: tomcat server works.
Modified:
geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/core/security/PropertiesLoginModuleManager.java
geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml
geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/config.xml
geronimo/branches/1.1/configs/activemq-broker/src/plan/plan.xml
geronimo/branches/1.1/configs/activemq/project.xml
geronimo/branches/1.1/configs/console-jetty/project.xml
geronimo/branches/1.1/configs/console-jetty/src/plan/plan.xml
geronimo/branches/1.1/configs/console-tomcat/project.xml
geronimo/branches/1.1/configs/console-tomcat/src/plan/plan.xml
geronimo/branches/1.1/configs/daytrader-jetty/src/plan/plan.xml
geronimo/branches/1.1/configs/daytrader-tomcat/src/plan/plan.xml
geronimo/branches/1.1/configs/hot-deployer/project.xml
geronimo/branches/1.1/configs/tomcat-deployer/src/plan/plan.xml
geronimo/branches/1.1/configs/tomcat/src/plan/plan.xml
geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
geronimo/branches/1.1/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/security/PasswordCredentialLoginModuleWrapper.java
geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/CommandSupport.java
geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java
geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
geronimo/branches/1.1/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/JettyManagerImpl.java
geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/AbstractNameQuery.java
geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java
geronimo/branches/1.1/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/jaas/DirectConfigurationEntry.java
geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginModuleUse.java
geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleSettings.java
geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/WebAppUtil.java
geronimo/branches/1.1/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Modified: geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/core/security/PropertiesLoginModuleManager.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/core/security/PropertiesLoginModuleManager.java?rev=388996&r1=388995&r2=388996&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/core/security/PropertiesLoginModuleManager.java (original)
+++ geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/core/security/PropertiesLoginModuleManager.java Sun Mar 26 16:52:46 2006
@@ -33,15 +33,15 @@
import org.apache.geronimo.common.GeronimoSecurityException;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.security.jaas.LoginModuleGBean;
-import org.apache.geronimo.system.serverinfo.ServerInfo;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.security.jaas.LoginModuleSettings;
+import org.apache.geronimo.system.serverinfo.ServerInfo;
public class PropertiesLoginModuleManager {
private ServerInfo serverInfo;
- private LoginModuleGBean loginModule;
+ private LoginModuleSettings loginModule;
private Properties users = new Properties();
@@ -51,8 +51,7 @@
private static final String groupsKey = "groupsURI";
- public PropertiesLoginModuleManager(ServerInfo serverInfo,
- LoginModuleGBean loginModule) {
+ public PropertiesLoginModuleManager(ServerInfo serverInfo, LoginModuleSettings loginModule) {
this.serverInfo = serverInfo;
this.loginModule = loginModule;
}
@@ -103,7 +102,7 @@
throws GeronimoSecurityException {
if (users.getProperty((String) properties.get("UserName")) != null) {
throw new GeronimoSecurityException("User principal "
- + (String) properties.get("UserName") + " already exists.");
+ + properties.get("UserName") + " already exists.");
}
try {
refreshUsers();
@@ -147,7 +146,7 @@
refreshGroups();
if (groups.getProperty((String) properties.get("GroupName")) != null) {
throw new GeronimoSecurityException("Group "
- + (String) properties.get("GroupName") + " already exists.");
+ + properties.get("GroupName") + " already exists.");
}
try {
groups.setProperty((String) properties.get("GroupName"),
@@ -211,7 +210,7 @@
if (groups.getProperty(groupPrincipal) == null) {
return memberSet;
}
- String[] members = ((String) groups.getProperty(groupPrincipal))
+ String[] members = groups.getProperty(groupPrincipal)
.split(",");
memberSet.addAll(Arrays.asList(members));
@@ -226,42 +225,52 @@
return loginModule.getOptions().getProperty(groupsKey);
}
+ private void store(Properties props, URL url) throws Exception {
+ OutputStream out;
+ try {
+ URLConnection con = url.openConnection();
+ con.setDoOutput(true);
+ out = con.getOutputStream();
+ } catch (Exception e) {
+ if ("file".equalsIgnoreCase(url.getProtocol()) && e instanceof UnknownServiceException) {
+ out = new FileOutputStream(new File(url.getFile()));
+ } else {
+ throw e;
+ }
+ }
+ props.store(out, null);
+ try {
+ out.close();
+ } catch (IOException ie) {
+ // Ignore
+ }
+ }
+
public static final GBeanInfo GBEAN_INFO;
static {
GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("PropertiesLoginModuleManager", PropertiesLoginModuleManager.class);
- infoFactory.addOperation("addUserPrincipal",
- new Class[] { Hashtable.class });
- infoFactory.addOperation("removeUserPrincipal",
- new Class[] { String.class });
- infoFactory.addOperation("updateUserPrincipal",
- new Class[] { Hashtable.class });
+ infoFactory.addOperation("addUserPrincipal", new Class[]{Hashtable.class});
+ infoFactory.addOperation("removeUserPrincipal", new Class[]{String.class});
+ infoFactory.addOperation("updateUserPrincipal", new Class[]{Hashtable.class});
infoFactory.addOperation("getGroups");
infoFactory.addOperation("getUsers");
- infoFactory.addOperation("updateUserPrincipal",
- new Class[] { Hashtable.class });
+ infoFactory.addOperation("updateUserPrincipal", new Class[]{Hashtable.class});
- infoFactory.addOperation("getPassword", new Class[] { String.class });
- infoFactory.addOperation("getGroupMembers",
- new Class[] { String.class });
- infoFactory.addOperation("addGroupPrincipal",
- new Class[] { Hashtable.class });
- infoFactory.addOperation("removeGroupPrincipal",
- new Class[] { String.class });
- infoFactory.addOperation("updateGroupPrincipal",
- new Class[] { Hashtable.class });
- infoFactory.addOperation("addToGroup", new Class[] { String.class,
- String.class });
- infoFactory.addOperation("removeFromGroup", new Class[] { String.class,
- String.class });
+ infoFactory.addOperation("getPassword", new Class[]{String.class});
+ infoFactory.addOperation("getGroupMembers", new Class[]{String.class});
+ infoFactory.addOperation("addGroupPrincipal", new Class[]{Hashtable.class});
+ infoFactory.addOperation("removeGroupPrincipal", new Class[]{String.class});
+ infoFactory.addOperation("updateGroupPrincipal", new Class[]{Hashtable.class});
+ infoFactory.addOperation("addToGroup", new Class[]{String.class, String.class});
+ infoFactory.addOperation("removeFromGroup", new Class[]{String.class, String.class});
infoFactory.addReference("ServerInfo", ServerInfo.class, NameFactory.GERONIMO_SERVICE);
- infoFactory.addReference("LoginModule", LoginModuleGBean.class, NameFactory.LOGIN_MODULE);
+ infoFactory.addReference("LoginModule", LoginModuleSettings.class, NameFactory.LOGIN_MODULE);
- infoFactory
- .setConstructor(new String[] { "ServerInfo", "LoginModule" });
+ infoFactory.setConstructor(new String[]{"ServerInfo", "LoginModule"});
GBEAN_INFO = infoFactory.getBeanInfo();
}
@@ -270,24 +279,4 @@
return GBEAN_INFO;
}
- private void store(Properties props, URL url) throws Exception{
- OutputStream out = null;
- try {
- URLConnection con = url.openConnection();
- con.setDoOutput(true);
- out = con.getOutputStream();
- } catch(Exception e){
- if("file".equalsIgnoreCase(url.getProtocol()) && e instanceof UnknownServiceException) {
- out = new FileOutputStream(new File(url.getFile()));
- } else {
- throw e;
- }
- }
- props.store(out, null);
- try {
- out.close();
- } catch(IOException ie) {
- // Ignore
- }
- }
}
Modified: geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml?rev=388996&r1=388995&r2=388996&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml (original)
+++ geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml Sun Mar 26 16:52:46 2006
@@ -49,13 +49,15 @@
<attribute name="port">${PlanDerbyPort}</attribute>
</gbean>
</configuration>
+<!--
<configuration name="geronimo/activemq-broker/${pom.currentVersion}/car">
<gbean name="ActiveMQ.tcp.default">
<attribute name="host">${PlanServerHostname}</attribute>
<attribute name="port">${PlanActiveMQPort}</attribute>
</gbean>
</configuration>
- <configuration name="geronimo/activemq/${pom.currentVersion}/car"/>
+-->
+ <!--<configuration name="geronimo/activemq/${pom.currentVersion}/car"/>-->
<configuration name="geronimo/directory/${pom.currentVersion}/car">
<gbean name="geronimo.server:name=DirectoryService">
<attribute name="host">${PlanServerHostname}</attribute>
@@ -99,8 +101,8 @@
<configuration name="geronimo/webconsole-jetty_geronimo-console-standard-${pom.currentVersion}.war/${pom.currentVersion}/car"/>
<configuration name="geronimo/uddi-jetty/${pom.currentVersion}/car"/>
<configuration name="geronimo/jmxdebug-jetty/${pom.currentVersion}/car"/>
- <configuration name="geronimo/daytrader-derby-jetty/${pom.currentVersion}/car"/>
- <configuration name="geronimo/daytrader-derby-jetty_daytrader-web-${pom.currentVersion}.war/${pom.currentVersion}/car"/>
+ <!--<configuration name="geronimo/daytrader-derby-jetty/${pom.currentVersion}/car"/>-->
+ <!--<configuration name="geronimo/daytrader-derby-jetty_daytrader-web-${pom.currentVersion}.war/${pom.currentVersion}/car"/>-->
<configuration name="geronimo/remote-deploy-jetty/${pom.currentVersion}/car"/>
<configuration name="geronimo/hot-deployer/${pom.currentVersion}/car" />
</attributes>
Modified: geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/config.xml?rev=388996&r1=388995&r2=388996&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/config.xml (original)
+++ geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/config.xml Sun Mar 26 16:52:46 2006
@@ -49,13 +49,15 @@
<attribute name="port">${PlanDerbyPort}</attribute>
</gbean>
</configuration>
+<!--
<configuration name="geronimo/activemq-broker/${pom.currentVersion}/car">
<gbean name="ActiveMQ.tcp.default">
<attribute name="host">${PlanServerHostname}</attribute>
<attribute name="port">${PlanActiveMQPort}</attribute>
</gbean>
</configuration>
- <configuration name="geronimo/activemq/${pom.currentVersion}/car"/>
+-->
+ <!--<configuration name="geronimo/activemq/${pom.currentVersion}/car"/>-->
<configuration name="geronimo/directory/${pom.currentVersion}/car">
<gbean name="geronimo.server:name=DirectoryService">
<attribute name="host">${PlanServerHostname}</attribute>
@@ -105,8 +107,8 @@
<configuration name="geronimo/webconsole-tomcat_geronimo-console-standard-${pom.currentVersion}.war/${pom.currentVersion}/car"/>
<configuration name="geronimo/uddi-tomcat/${pom.currentVersion}/car"/>
<configuration name="geronimo/jmxdebug-tomcat/${pom.currentVersion}/car"/>
- <configuration name="geronimo/daytrader-derby-tomcat/${pom.currentVersion}/car"/>
- <configuration name="geronimo/daytrader-derby-tomcat_daytrader-web-${pom.currentVersion}.war/${pom.currentVersion}/car"/>
+ <!--<configuration name="geronimo/daytrader-derby-tomcat/${pom.currentVersion}/car"/>-->
+ <!--<configuration name="geronimo/daytrader-derby-tomcat_daytrader-web-${pom.currentVersion}.war/${pom.currentVersion}/car"/>-->
<configuration name="geronimo/remote-deploy-tomcat/${pom.currentVersion}/car"/>
<configuration name="geronimo/hot-deployer/${pom.currentVersion}/car" />
</attributes>
Modified: geronimo/branches/1.1/configs/activemq-broker/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/activemq-broker/src/plan/plan.xml?rev=388996&r1=388995&r2=388996&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/activemq-broker/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/activemq-broker/src/plan/plan.xml Sun Mar 26 16:52:46 2006
@@ -29,38 +29,52 @@
<!-- message broker -->
<gbean name="ActiveMQ" class="org.activemq.gbean.ActiveMQContainerGBean">
<attribute name="brokerName">possibly-unique-broker</attribute>
- <reference name="persistenceAdapter"><name>ActiveMQ.cache</name></reference>
+ <reference name="persistenceAdapter">
+ <name>ActiveMQ.cache</name>
+ </reference>
</gbean>
<gbean name="ActiveMQ.cache" class="org.activemq.store.cache.SimpleCachePersistenceAdapterGBean">
<attribute name="cacheSize">10000</attribute>
- <reference name="longTermPersistence"><name>ActiveMQ.journal</name></reference>
+ <reference name="longTermPersistence">
+ <name>ActiveMQ.journal</name>
+ </reference>
</gbean>
<gbean name="ActiveMQ.journal" class="org.activemq.store.journal.JournalPersistenceAdapterGBean">
<!--TODO change to ServerInfo -->
- <reference name="serverInfo"><module>geronimo/j2ee-system/${pom.currentVersion}/car</module><type>GBean</type><name>ServerInfo</name></reference>
+ <reference name="serverInfo">
+ <name>ServerInfo</name>
+ </reference>
<attribute name="directory">var/activemq/journal</attribute>
<attribute name="journalType">default</attribute>
- <reference name="longTermPersistence"><name>ActiveMQ.jdbc</name></reference>
+ <reference name="longTermPersistence">
+ <name>ActiveMQ.jdbc</name>
+ </reference>
</gbean>
<gbean name="ActiveMQ.jdbc" class="org.activemq.store.jdbc.JDBCPersistenceAdapterGBean">
- <reference name="dataSource"><name>SystemDatasource</name></reference>
+ <reference name="dataSource">
+ <name>SystemDatasource</name>
+ </reference>
</gbean>
<gbean name="ActiveMQ.tcp.default" class="org.activemq.gbean.ActiveMQConnectorGBean">
<attribute name="protocol">tcp</attribute>
<attribute name="host">localhost</attribute>
<attribute name="port">61616</attribute>
- <reference name="activeMQContainer"><name>ActiveMQ</name></reference>
+ <reference name="activeMQContainer">
+ <name>ActiveMQ</name>
+ </reference>
</gbean>
<gbean name="ActiveMQ.vm.localhost" class="org.activemq.gbean.ActiveMQConnectorGBean">
<attribute name="protocol">vm</attribute>
<attribute name="host">localhost</attribute>
<attribute name="port">-1</attribute>
- <reference name="activeMQContainer"><name>ActiveMQ</name></reference>
+ <reference name="activeMQContainer">
+ <name>ActiveMQ</name>
+ </reference>
</gbean>
<gbean name="SystemProperties" class="org.apache.geronimo.system.properties.SystemProperties">
Modified: geronimo/branches/1.1/configs/activemq/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/activemq/project.xml?rev=388996&r1=388995&r2=388996&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/activemq/project.xml (original)
+++ geronimo/branches/1.1/configs/activemq/project.xml Sun Mar 26 16:52:46 2006
@@ -52,7 +52,8 @@
<version>${geronimo_version}</version>
<type>car</type>
<properties>
- <geronimo.import>true</geronimo.import>
+ <!--presumably temporary, till broker gbeans are fixed-->
+ <!--<geronimo.import>true</geronimo.import>-->
</properties>
</dependency>
<dependency>
Modified: geronimo/branches/1.1/configs/console-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/console-jetty/project.xml?rev=388996&r1=388995&r2=388996&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/console-jetty/project.xml (original)
+++ geronimo/branches/1.1/configs/console-jetty/project.xml Sun Mar 26 16:52:46 2006
@@ -57,122 +57,132 @@
<version>${geronimo_version}</version>
<type>car</type>
<properties>
- <geronimo.import>true</geronimo.import>
- </properties>
+ <geronimo.import>true</geronimo.import>
+ </properties>
+ </dependency>
+ <!-- for login module manager -->
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>j2ee-security</artifactId>
+ <version>${geronimo_version}</version>
+ <type>car</type>
+ <properties>
+ <geronimo.import>true</geronimo.import>
+ </properties>
</dependency>
- <dependency>
- <groupId>portlet-api</groupId>
- <artifactId>portlet-api</artifactId>
- <version>${portlet_api_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
- </dependency>
- <dependency>
- <groupId>org.apache.pluto</groupId>
- <artifactId>pluto</artifactId>
- <version>${pluto_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-console-core</artifactId>
- <version>${geronimo_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-management</artifactId>
- <version>${geronimo_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-test-ddbean</artifactId>
- <version>${geronimo_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-deploy-jsr88</artifactId>
- <version>${geronimo_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-deploy-config</artifactId>
- <version>${geronimo_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-service-builder</artifactId>
- <version>${geronimo_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-connector-builder</artifactId>
- <version>${geronimo_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-naming-builder</artifactId>
- <version>${geronimo_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-security-builder</artifactId>
- <version>${geronimo_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-j2ee-schema</artifactId>
- <version>${geronimo_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
- </dependency>
- <dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
- <version>${xmlbeans_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>${stax_api_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
- </dependency>
+ <dependency>
+ <groupId>portlet-api</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>${portlet_api_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto</artifactId>
+ <version>${pluto_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-console-core</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-management</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-test-ddbean</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-deploy-jsr88</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-deploy-config</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-service-builder</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-connector-builder</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-naming-builder</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-security-builder</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-j2ee-schema</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ <version>${xmlbeans_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>${stax_api_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
<dependency>
<groupId>activemq</groupId>
<artifactId>activemq-gbean-management</artifactId>
@@ -197,24 +207,24 @@
<geronimo.dependency>true</geronimo.dependency>
</properties>
</dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-converter</artifactId>
- <version>${geronimo_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
- </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-converter</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
- <!-- Keystore dependency -->
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-util</artifactId>
- <version>${geronimo_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
- </dependency>
+ <!-- Keystore dependency -->
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-util</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
<dependency>
<groupId>geronimo</groupId>
Modified: geronimo/branches/1.1/configs/console-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/console-jetty/src/plan/plan.xml?rev=388996&r1=388995&r2=388996&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/console-jetty/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/console-jetty/src/plan/plan.xml Sun Mar 26 16:52:46 2006
@@ -52,15 +52,9 @@
<!-- Console specific server info -->
<gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
<reference name="ServerInfo">
- <!--<application>null</application>-->
- <!--<moduleType>J2EEModule</moduleType>-->
- <!--<module>${pom.groupId}/j2ee-system/${pom.currentVersion}/car</module>-->
<name>ServerInfo</name>
</reference>
<reference name="LoginModule">
- <!--<application>null</application>-->
- <!--<moduleType>J2EEModule</moduleType>-->
- <!--<module>${pom.groupId}/j2ee-security/${pom.currentVersion}/car</module>-->
<name>properties-login</name>
</reference>
</gbean>
@@ -72,9 +66,6 @@
<attribute name="keyStoreProvider">SUN</attribute>
<attribute name="keyStorePassword">password</attribute>
<reference name="serverInfo">
- <!--<application>null</application>-->
- <!--<moduleType>J2EEModule</moduleType>-->
- <!--<module>${pom.groupId}/j2ee-system/${pom.currentVersion}/car</module>-->
<name>ServerInfo</name>
</reference>
</gbean>
Modified: geronimo/branches/1.1/configs/console-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/console-tomcat/project.xml?rev=388996&r1=388995&r2=388996&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/console-tomcat/project.xml (original)
+++ geronimo/branches/1.1/configs/console-tomcat/project.xml Sun Mar 26 16:52:46 2006
@@ -58,122 +58,132 @@
<version>${geronimo_version}</version>
<type>car</type>
<properties>
- <geronimo.import>true</geronimo.import>
- </properties>
+ <geronimo.import>true</geronimo.import>
+ </properties>
+ </dependency>
+ <!-- for login module manager -->
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>j2ee-security</artifactId>
+ <version>${geronimo_version}</version>
+ <type>car</type>
+ <properties>
+ <geronimo.import>true</geronimo.import>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>portlet-api</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>${portlet_api_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto</artifactId>
+ <version>${pluto_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-console-core</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-management</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-test-ddbean</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-deploy-jsr88</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-deploy-config</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-service-builder</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-connector-builder</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-naming-builder</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-security-builder</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-j2ee-schema</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ <version>${xmlbeans_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>${stax_api_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
-
- <dependency>
- <groupId>portlet-api</groupId>
- <artifactId>portlet-api</artifactId>
- <version>${portlet_api_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
- </dependency>
- <dependency>
- <groupId>org.apache.pluto</groupId>
- <artifactId>pluto</artifactId>
- <version>${pluto_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-console-core</artifactId>
- <version>${geronimo_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-management</artifactId>
- <version>${geronimo_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-test-ddbean</artifactId>
- <version>${geronimo_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-deploy-jsr88</artifactId>
- <version>${geronimo_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-deploy-config</artifactId>
- <version>${geronimo_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-service-builder</artifactId>
- <version>${geronimo_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-connector-builder</artifactId>
- <version>${geronimo_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-naming-builder</artifactId>
- <version>${geronimo_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-security-builder</artifactId>
- <version>${geronimo_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-j2ee-schema</artifactId>
- <version>${geronimo_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
- </dependency>
- <dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
- <version>${xmlbeans_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>${stax_api_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
- </dependency>
<dependency>
<groupId>activemq</groupId>
<artifactId>activemq-gbean-management</artifactId>
@@ -198,24 +208,24 @@
<geronimo.dependency>true</geronimo.dependency>
</properties>
</dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-converter</artifactId>
- <version>${geronimo_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
- </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-converter</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
- <!-- Keystore dependency -->
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-util</artifactId>
- <version>${geronimo_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
- </dependency>
+ <!-- Keystore dependency -->
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-util</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
<dependency>
<groupId>geronimo</groupId>
Modified: geronimo/branches/1.1/configs/console-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/console-tomcat/src/plan/plan.xml?rev=388996&r1=388995&r2=388996&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/console-tomcat/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/console-tomcat/src/plan/plan.xml Sun Mar 26 16:52:46 2006
@@ -54,15 +54,9 @@
<!-- Console specific server info -->
<gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
<reference name="ServerInfo">
- <!--<application>null</application>-->
- <!--<moduleType>J2EEModule</moduleType>-->
- <!--<module>${pom.groupId}/j2ee-system/${pom.currentVersion}/car</module>-->
<name>ServerInfo</name>
</reference>
<reference name="LoginModule">
- <!--<application>null</application>-->
- <!--<moduleType>J2EEModule</moduleType>-->
- <!--<module>${pom.groupId}/j2ee-security/${pom.currentVersion}/car</module>-->
<name>properties-login</name>
</reference>
</gbean>
@@ -74,9 +68,6 @@
<attribute name="keyStoreProvider">SUN</attribute>
<attribute name="keyStorePassword">password</attribute>
<reference name="serverInfo">
- <!--<application>null</application>-->
- <!--<moduleType>J2EEModule</moduleType>-->
- <!--<module>${pom.groupId}/j2ee-system/${pom.currentVersion}/car</module>-->
<name>ServerInfo</name>
</reference>
</gbean>
Modified: geronimo/branches/1.1/configs/daytrader-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/daytrader-jetty/src/plan/plan.xml?rev=388996&r1=388995&r2=388996&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/daytrader-jetty/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/daytrader-jetty/src/plan/plan.xml Sun Mar 26 16:52:46 2006
@@ -280,8 +280,8 @@
<message-driven>
<ejb-name>TradeStreamerMDB</ejb-name>
<resource-adapter>
- <resource-link>TradeJMS</resource-link>
- <!--<resource-link>TradeJMSResources</resource-link>-->
+ <!--<resource-link>TradeJMS</resource-link>-->
+ <resource-link>TradeJMSResources</resource-link>
</resource-adapter>
<activation-config>
<activation-config-property>
@@ -306,8 +306,8 @@
<message-driven>
<ejb-name>TradeBrokerMDB</ejb-name>
<resource-adapter>
- <resource-link>TradeJMS</resource-link>
- <!--<resource-link>TradeJMSResources</resource-link>-->
+ <!--<resource-link>TradeJMS</resource-link>-->
+ <resource-link>TradeJMSResources</resource-link>
</resource-adapter>
<activation-config>
<activation-config-property>
Modified: geronimo/branches/1.1/configs/daytrader-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/daytrader-tomcat/src/plan/plan.xml?rev=388996&r1=388995&r2=388996&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/daytrader-tomcat/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/daytrader-tomcat/src/plan/plan.xml Sun Mar 26 16:52:46 2006
@@ -280,8 +280,8 @@
<message-driven>
<ejb-name>TradeStreamerMDB</ejb-name>
<resource-adapter>
- <resource-link>TradeJMS</resource-link>
- <!--<resource-link>TradeJMSResources</resource-link>-->
+ <!--<resource-link>TradeJMS</resource-link>-->
+ <resource-link>TradeJMSResources</resource-link>
</resource-adapter>
<activation-config>
<activation-config-property>
@@ -306,8 +306,8 @@
<message-driven>
<ejb-name>TradeBrokerMDB</ejb-name>
<resource-adapter>
- <resource-link>TradeJMS</resource-link>
- <!--<resource-link>TradeJMSResources</resource-link>-->
+ <!--<resource-link>TradeJMS</resource-link>-->
+ <resource-link>TradeJMSResources</resource-link>
</resource-adapter>
<activation-config>
<activation-config-property>
Modified: geronimo/branches/1.1/configs/hot-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/hot-deployer/project.xml?rev=388996&r1=388995&r2=388996&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/hot-deployer/project.xml (original)
+++ geronimo/branches/1.1/configs/hot-deployer/project.xml Sun Mar 26 16:52:46 2006
@@ -42,6 +42,16 @@
<geronimo.import>true</geronimo.import>
</properties>
</dependency>
+ <!-- should be services-only dependency -->
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>j2ee-deployer</artifactId>
+ <version>${geronimo_version}</version>
+ <type>car</type>
+ <properties>
+ <geronimo.reference>true</geronimo.reference>
+ </properties>
+ </dependency>
<dependency>
Modified: geronimo/branches/1.1/configs/tomcat-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/tomcat-deployer/src/plan/plan.xml?rev=388996&r1=388995&r2=388996&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/tomcat-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/tomcat-deployer/src/plan/plan.xml Sun Mar 26 16:52:46 2006
@@ -24,7 +24,6 @@
<attribute name="defaultContextPriorityClassloader">false</attribute>
<attribute name="tomcatContainerName">?name=TomcatWebContainer</attribute>
<reference name="WebServiceBuilder">
- <!--<module>${pom.groupId}/j2ee-deployer/${pom.currentVersion}/car</module>-->
<name>WebServiceBuilder</name>
</reference>
<xml-attribute name="defaultEnvironment">
Modified: geronimo/branches/1.1/configs/tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/tomcat/src/plan/plan.xml?rev=388996&r1=388995&r2=388996&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/tomcat/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/tomcat/src/plan/plan.xml Sun Mar 26 16:52:46 2006
@@ -31,7 +31,6 @@
<attribute name="prefix">META-INF/geronimo-tomcat</attribute>
<attribute name="path">var/catalina</attribute>
<reference name="ServerInfo">
- <module>geronimo/j2ee-system/${pom.currentVersion}/car</module>
<name>ServerInfo</name>
</reference>
</gbean>
@@ -50,7 +49,6 @@
<name>TomcatEngine</name>
</reference>
<reference name="ServerInfo">
- <module>geronimo/j2ee-system/${pom.currentVersion}/car</module>
<name>ServerInfo</name>
</reference>
</gbean>
@@ -108,7 +106,6 @@
<name>TomcatWebContainer</name>
</reference>
<reference name="ServerInfo">
- <module>geronimo/j2ee-system/${pom.currentVersion}/car</module>
<name>ServerInfo</name>
</reference>
</gbean>
@@ -134,14 +131,12 @@
<name>FirstValve</name>
</reference>
<dependency>
- <type>GBean</type>
<name>TomcatResources</name>
</dependency>
</gbean>
<gbean name="TomcatAccessLogManager" class="org.apache.geronimo.tomcat.TomcatLogManagerImpl">
<reference name="ServerInfo">
- <!--<module>geronimo/j2ee-system/${pom.currentVersion}/car</module>-->
<name>ServerInfo</name>
</reference>
<references name="LogGBeans">
Modified: geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?rev=388996&r1=388995&r2=388996&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java (original)
+++ geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java Sun Mar 26 16:52:46 2006
@@ -85,6 +85,7 @@
import org.apache.geronimo.xbeans.j2ee.ConnectorType;
import org.apache.geronimo.xbeans.j2ee.MessagelistenerType;
import org.apache.geronimo.xbeans.j2ee.ResourceadapterType;
+import org.apache.geronimo.management.geronimo.ResourceAdapterModule;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
@@ -289,8 +290,7 @@
//set up the metadata for the ResourceAdapterModule
GBeanData resourceAdapterModuleData = new GBeanData(resourceAdapterModuleName, ResourceAdapterModuleImplGBean.GBEAN_INFO);
// initalize the GBean
- //TODO configid when we figure out how to install the J2EEServer gbean, uncomment this
-// resourceAdapterModuleData.setReferencePattern(NameFactory.J2EE_SERVER, earContext.getServerName());
+ resourceAdapterModuleData.setReferencePattern(NameFactory.J2EE_SERVER, earContext.getServerName());
if (!earContext.getModuleName().equals(resourceAdapterModuleName)) {
resourceAdapterModuleData.setReferencePattern(NameFactory.J2EE_APPLICATION, earContext.getModuleName());
}
@@ -760,7 +760,22 @@
return new ResourceReference(configuration.getId(), containerId, iface);
}
- public GBeanData locateActivationSpecInfo(AbstractNameQuery nameQuery, String messageListenerInterface, Configuration configuration) throws DeploymentException {
+ public GBeanData locateActivationSpecInfo(AbstractNameQuery resourceAdapterInstanceQuery, String messageListenerInterface, Configuration configuration) throws DeploymentException {
+ //First, locate the module gbean from the JCAResourceAdapter instance
+ AbstractName instanceName = null;
+ try {
+ instanceName = configuration.findGBean(resourceAdapterInstanceQuery);
+ } catch (GBeanNotFoundException e) {
+ throw new DeploymentException("No resource adapter instance gbean found matching " + resourceAdapterInstanceQuery + " from configuration " + configuration.getId());
+ }
+ String moduleName = (String) instanceName.getName().get(NameFactory.RESOURCE_ADAPTER_MODULE);
+ Map moduleNameMap = new HashMap(instanceName.getName());
+ moduleNameMap.remove(NameFactory.JCA_RESOURCE);
+ moduleNameMap.remove(NameFactory.RESOURCE_ADAPTER);
+ moduleNameMap.put(NameFactory.J2EE_TYPE, NameFactory.RESOURCE_ADAPTER_MODULE);
+ moduleNameMap.put(NameFactory.J2EE_NAME, moduleName);
+ AbstractNameQuery nameQuery = new AbstractNameQuery(instanceName.getArtifact(), moduleNameMap, ResourceAdapterModule.class.getName());
+ //now find the gbeandata and extract the activation spec info.
GBeanData resourceModuleData;
try {
resourceModuleData = configuration.findGBeanData(nameQuery);
Modified: geronimo/branches/1.1/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java?rev=388996&r1=388995&r2=388996&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java (original)
+++ geronimo/branches/1.1/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java Sun Mar 26 16:52:46 2006
@@ -48,12 +48,16 @@
import org.apache.geronimo.kernel.config.EditableKernelConfigurationManager;
import org.apache.geronimo.kernel.config.InvalidConfigException;
import org.apache.geronimo.kernel.config.NoSuchConfigException;
+import org.apache.geronimo.kernel.config.ConfigurationResolver;
+import org.apache.geronimo.kernel.config.ConfigurationModuleType;
import org.apache.geronimo.kernel.management.State;
import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.kernel.repository.DefaultArtifactManager;
import org.apache.geronimo.kernel.repository.DefaultArtifactResolver;
import org.apache.geronimo.kernel.repository.Environment;
import org.apache.geronimo.kernel.repository.Repository;
+import org.apache.geronimo.kernel.repository.ImportType;
+import org.apache.geronimo.system.serverinfo.BasicServerInfo;
import org.tranql.sql.jdbc.JDBCUtil;
import javax.naming.Reference;
@@ -75,6 +79,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.HashMap;
import java.util.jar.JarFile;
/**
@@ -153,7 +158,7 @@
private static final Artifact bootId = new Artifact("test", "test", "", "car");
private static final AbstractNameQuery connectionTrackerName = new AbstractNameQuery(null, Collections.singletonMap("name", "ConnectionTracker"));
- private static final AbstractName serverName = naming.createRootName(bootId, "Server", "J2EEServer");
+ private AbstractName serverName;
private static final AbstractNameQuery transactionContextManagerName = new AbstractNameQuery(null, Collections.singletonMap("name", "TransactionContextManager"));
@@ -483,6 +488,19 @@
ConfigurationData bootstrap = new ConfigurationData(bootId, naming);
+// GBeanData artifactManagerData = bootstrap.addGBean("ArtifactManager", DefaultArtifactManager.GBEAN_INFO);
+//
+// GBeanData artifactResolverData = bootstrap.addGBean("ArtifactResolver", DefaultArtifactResolver.GBEAN_INFO);
+// artifactResolverData.setReferencePattern("ArtifactManager", artifactManagerData.getAbstractName());
+//
+// GBeanData configurationManagerData = bootstrap.addGBean("ConfigurationManager", EditableKernelConfigurationManager.GBEAN_INFO);
+// configurationManagerData.setReferencePattern("ArtifactManager", artifactManagerData.getAbstractName());
+// configurationManagerData.setReferencePattern("ArtifactResolver", artifactResolverData.getAbstractName());
+// bootstrap.addGBean(configurationManagerData);
+ bootstrap.addGBean("ServerInfo", BasicServerInfo.GBEAN_INFO).setAttribute("baseDirectory", ".");
+
+ AbstractName configStoreName = bootstrap.addGBean("MockConfigurationStore", MockConfigStore.GBEAN_INFO).getAbstractName();
+
GBeanData artifactManagerData = bootstrap.addGBean("ArtifactManager", DefaultArtifactManager.GBEAN_INFO);
GBeanData artifactResolverData = bootstrap.addGBean("ArtifactResolver", DefaultArtifactResolver.GBEAN_INFO);
@@ -491,16 +509,22 @@
GBeanData configurationManagerData = bootstrap.addGBean("ConfigurationManager", EditableKernelConfigurationManager.GBEAN_INFO);
configurationManagerData.setReferencePattern("ArtifactManager", artifactManagerData.getAbstractName());
configurationManagerData.setReferencePattern("ArtifactResolver", artifactResolverData.getAbstractName());
+ configurationManagerData.setReferencePattern("Stores", configStoreName);
bootstrap.addGBean(configurationManagerData);
- GBeanData serverData = new GBeanData(serverName, J2EEServerImpl.GBEAN_INFO);
+ GBeanData serverData = bootstrap.addGBean("geronimo", J2EEServerImpl.GBEAN_INFO);
+ serverName = serverData.getAbstractName();
bootstrap.addGBean(serverData);
ConfigurationUtil.loadBootstrapConfiguration(kernel, bootstrap, getClass().getClassLoader());
configurationManager = ConfigurationUtil.getEditableConfigurationManager(kernel);
- configurationManager.getConfiguration(bootstrap.getId());
+// configurationManager.getConfiguration(bootstrap.getId());
+ ConfigurationStore configStore = (ConfigurationStore) kernel.getGBean(configStoreName);
+ configStore.install(bootstrap);
+
defaultEnvironment = new Environment();
+ defaultEnvironment.addDependency(bootstrap.getId(), ImportType.ALL);
}
@@ -526,26 +550,47 @@
}
public static class MockConfigStore implements ConfigurationStore {
+ private Map configs = new HashMap();
+
+ URL baseURL;
public MockConfigStore() {
}
+ public MockConfigStore(URL baseURL) {
+ this.baseURL = baseURL;
+ }
+
public void install(ConfigurationData configurationData) throws IOException, InvalidConfigException {
+ configs.put(configurationData.getId(), configurationData);
}
public void uninstall(Artifact configID) throws NoSuchConfigException, IOException {
+ configs.remove(configID);
}
public GBeanData loadConfiguration(Artifact configId) throws NoSuchConfigException, IOException, InvalidConfigException {
AbstractName configurationObjectName = Configuration.getConfigurationAbstractName(configId);
GBeanData configData = new GBeanData(configurationObjectName, Configuration.GBEAN_INFO);
- Environment environment = new Environment();
- environment.setConfigId(configId);
- environment.getProperties().put(NameFactory.JSR77_BASE_NAME_PROPERTY, "geronimo.test:J2EEServer=geronimo");
- configData.setAttribute("environment", environment);
- configData.setAttribute("gBeanState", NO_OBJECTS_OS);
-
-
+ if (configs.containsKey(configId)) {
+ ConfigurationData configurationData = (ConfigurationData) configs.get(configId);
+ configData.setAttribute("moduleType", configurationData.getModuleType());
+ Environment environment = configurationData.getEnvironment();
+ configData.setAttribute("environment", environment);
+ configData.setAttribute("gBeanState", Configuration.storeGBeans(configurationData.getGBeans()));
+ configData.setAttribute("classPath", configurationData.getClassPath());
+
+ ConfigurationResolver configurationResolver = new ConfigurationResolver(configurationData.getEnvironment().getConfigId(), this, Collections.EMPTY_SET, new DefaultArtifactResolver(null, Collections.EMPTY_SET));
+ configData.setAttribute("configurationResolver", configurationResolver);
+
+ } else {
+ Environment environment = new Environment();
+ environment.setConfigId(configId);
+ environment.getProperties().put(NameFactory.JSR77_BASE_NAME_PROPERTY, "geronimo.test:J2EEServer=geronimo");
+ configData.setAttribute("environment", environment);
+ configData.setAttribute("moduleType", ConfigurationModuleType.WAR);
+ configData.setAttribute("gBeanState", NO_OBJECTS_OS);
+ }
return configData;
}
@@ -570,7 +615,7 @@
}
public URL resolve(Artifact configId, URI uri) throws NoSuchConfigException, MalformedURLException {
- return null;
+ return baseURL;
}
public final static GBeanInfo GBEAN_INFO;
Modified: geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/security/PasswordCredentialLoginModuleWrapper.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/security/PasswordCredentialLoginModuleWrapper.java?rev=388996&r1=388995&r2=388996&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/security/PasswordCredentialLoginModuleWrapper.java (original)
+++ geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/security/PasswordCredentialLoginModuleWrapper.java Sun Mar 26 16:52:46 2006
@@ -28,7 +28,8 @@
public class PasswordCredentialLoginModuleWrapper extends LoginModuleGBean {
public static final String MANAGED_CONNECTION_FACTORY_OPTION = "geronimo.managedconnectionfactory.option";
- public void setManagedConnectionFactoryWrapper(ManagedConnectionFactoryWrapper managedConnectionFactoryWrapper) {
+ public PasswordCredentialLoginModuleWrapper(String loginModuleClass, String objectName, boolean serverSide, boolean wrapPrincipals, ManagedConnectionFactoryWrapper managedConnectionFactoryWrapper, ClassLoader classLoader) {
+ super(loginModuleClass, objectName, serverSide, wrapPrincipals, classLoader);
ManagedConnectionFactory managedConnectionFactory = managedConnectionFactoryWrapper.$getManagedConnectionFactory();
Properties options = getOptions();
options.put(MANAGED_CONNECTION_FACTORY_OPTION, managedConnectionFactory);
Modified: geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/CommandSupport.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/CommandSupport.java?rev=388996&r1=388995&r2=388996&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/CommandSupport.java (original)
+++ geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/CommandSupport.java Sun Mar 26 16:52:46 2006
@@ -20,6 +20,8 @@
import org.apache.geronimo.deployment.plugin.TargetModuleIDImpl;
import org.apache.geronimo.deployment.plugin.jmx.JMXDeploymentManager.CommandContext;
import org.apache.geronimo.gbean.GBeanQuery;
+import org.apache.geronimo.gbean.AbstractNameQuery;
+import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.kernel.InternalKernelException;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.config.ConfigurationModuleType;
@@ -361,16 +363,16 @@
*/
public static Map mapContainersToURLs(Kernel kernel) throws Exception {
Map containers = new HashMap();
- Set set = kernel.listGBeans(new GBeanQuery(null, "org.apache.geronimo.management.geronimo.WebManager"));
+ Set set = kernel.listGBeans(new AbstractNameQuery("org.apache.geronimo.management.geronimo.WebManager"));
for (Iterator it = set.iterator(); it.hasNext();) {
- ObjectName mgrName = (ObjectName) it.next();
- String[] cntNames = (String[]) kernel.getAttribute(mgrName, "containers");
+ AbstractName mgrName = (AbstractName) it.next();
+ AbstractName[] cntNames = (AbstractName[]) kernel.getAttribute(mgrName, "containers");
for (int i = 0; i < cntNames.length; i++) {
- String cntName = cntNames[i];
- String[] cncNames = (String[]) kernel.invoke(mgrName, "getConnectorsForContainer", new Object[]{cntName}, new String[]{"java.lang.String"});
+ AbstractName cntName = cntNames[i];
+ AbstractName[] cncNames = (AbstractName[]) kernel.invoke(mgrName, "getConnectorsForContainer", new Object[]{cntName}, new String[]{AbstractName.class.getName()});
Map map = new HashMap();
for (int j = 0; j < cncNames.length; j++) {
- ObjectName cncName = ObjectName.getInstance(cncNames[j]);
+ AbstractName cncName = cncNames[j];
String protocol = (String) kernel.getAttribute(cncName, "protocol");
String url = (String) kernel.getAttribute(cncName, "connectUrl");
map.put(protocol, url);
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java?rev=388996&r1=388995&r2=388996&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java Sun Mar 26 16:52:46 2006
@@ -36,7 +36,7 @@
/**
- * @version $Rev: 386000 $ $Date$
+ * @version $Rev:386276 $ $Date$
*/
public class RefContext {
private final EJBReferenceBuilder ejbReferenceBuilder;
@@ -121,8 +121,8 @@
}
- public GBeanData getActivationSpecInfo(AbstractNameQuery resourceAdapterModuleName, String messageListenerInterfaceName, Configuration configuration) throws DeploymentException {
- return resourceReferenceBuilder.locateActivationSpecInfo(resourceAdapterModuleName, messageListenerInterfaceName, configuration);
+ public GBeanData getActivationSpecInfo(AbstractNameQuery resourceAdapterInstanceName, String messageListenerInterfaceName, Configuration configuration) throws DeploymentException {
+ return resourceReferenceBuilder.locateActivationSpecInfo(resourceAdapterInstanceName, messageListenerInterfaceName, configuration);
}
public AbstractName getMEJBName(Configuration configuration) throws DeploymentException {
Modified: geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java?rev=388996&r1=388995&r2=388996&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java (original)
+++ geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java Sun Mar 26 16:52:46 2006
@@ -130,28 +130,6 @@
* @param j2eeApplicationName
* @param j2eeModuleType
* @param j2eeModuleName
- * @param context
- * @return
- * @throws MalformedObjectNameException
- */
- public static ObjectName getModuleName(String j2eeDomainName, String j2eeServerName, String j2eeApplicationName, String j2eeModuleType, String j2eeModuleName, J2eeContext context) throws MalformedObjectNameException {
- Properties props = new Properties();
- //N.B.! module context will have the module's j2eeType as its module type attribute.
- props.put(J2EE_TYPE, context.getJ2eeModuleType(j2eeModuleType));
- props.put(J2EE_SERVER, context.getJ2eeServerName(j2eeServerName));
- props.put(J2EE_APPLICATION, context.getJ2eeApplicationName(j2eeApplicationName));
- props.put(J2EE_NAME, context.getJ2eeModuleName(j2eeModuleName));
- return ObjectName.getInstance(context.getJ2eeDomainName(j2eeDomainName), props);
- }
-
- /**
- *
- * @deprecated
- * @param j2eeDomainName
- * @param j2eeServerName
- * @param j2eeApplicationName
- * @param j2eeModuleType
- * @param j2eeModuleName
* @param j2eeName
* @param j2eeType
* @param context
@@ -165,68 +143,6 @@
props.put(J2EE_APPLICATION, context.getJ2eeApplicationName(j2eeApplicationName));
props.put(context.getJ2eeModuleType(j2eeModuleType), context.getJ2eeModuleName(j2eeModuleName));
props.put(J2EE_NAME, context.getJ2eeName(j2eeName));
- return ObjectName.getInstance(context.getJ2eeDomainName(j2eeDomainName), props);
- }
-
- /**
- *
- * @deprecated
- * @param j2eeDomainName
- * @param j2eeServerName
- * @param j2eeApplicationName
- * @param j2eeModuleName
- * @param j2eeName
- * @param j2eeType
- * @param context
- * @return
- * @throws MalformedObjectNameException
- */
- public static ObjectName getEjbComponentName(String j2eeDomainName, String j2eeServerName, String j2eeApplicationName, String j2eeModuleName, String j2eeName, String j2eeType, J2eeContext context) throws MalformedObjectNameException {
- return getComponentName(j2eeDomainName, j2eeServerName, j2eeApplicationName, EJB_MODULE, j2eeModuleName, j2eeName, j2eeType, context);
- }
-
-
-
- /**
- * @param j2eeDomainName
- * @param j2eeServerName
- * @param j2eeApplicationName
- * @param j2eeModuleName
- * @param j2eeName
- * @param j2eeType
- * @param context
- * @return
- * @throws MalformedObjectNameException
- * @deprecated
- */
- public static ObjectName getWebComponentName(String j2eeDomainName, String j2eeServerName, String j2eeApplicationName, String j2eeModuleName, String j2eeName, String j2eeType, J2eeContext context) throws MalformedObjectNameException {
- return getComponentName(j2eeDomainName, j2eeServerName, j2eeApplicationName, WEB_MODULE, j2eeModuleName, j2eeName, j2eeType, context);
- }
-
-
- /**
- * @param j2eeDomainName
- * @param j2eeServerName
- * @param j2eeApplicationName
- * @param j2eeModuleName
- * @param j2eeName
- * @param j2eeType
- * @param context
- * @return
- * @throws MalformedObjectNameException
- * @deprecated
- */
- //for non-j2ee-deployable resources such as the transaction manager
- public static ObjectName getComponentName(String j2eeDomainName, String j2eeServerName, String j2eeApplicationName, String j2eeModuleName, String j2eeName, String j2eeType, J2eeContext context) throws MalformedObjectNameException {
- Properties props = new Properties();
- props.put(J2EE_TYPE, context.getJ2eeType(j2eeType));
- props.put(J2EE_SERVER, context.getJ2eeServerName(j2eeServerName));
- props.put(J2EE_NAME, context.getJ2eeName(j2eeName));
- props.put(J2EE_APPLICATION, context.getJ2eeApplicationName(j2eeApplicationName));
- //TODO add module type
- if (context.getJ2eeModuleName(j2eeModuleName) != null) {
- props.put(J2EE_MODULE, context.getJ2eeModuleName(j2eeModuleName));
- }
return ObjectName.getInstance(context.getJ2eeDomainName(j2eeDomainName), props);
}
Modified: geronimo/branches/1.1/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java?rev=388996&r1=388995&r2=388996&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java Sun Mar 26 16:52:46 2006
@@ -340,7 +340,7 @@
webModuleData.setReferencePattern("J2EEServer", moduleContext.getServerName());
}
if (!module.isStandAlone()) {
- webModuleData.setReferencePattern("J2EEApplication", moduleContext.getModuleName());
+ webModuleData.setReferencePattern("J2EEApplication", earContext.getModuleName());
}
webModuleData.setAttribute("deploymentDescriptor", module.getOriginalSpecDD());
Modified: geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java?rev=388996&r1=388995&r2=388996&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java Sun Mar 26 16:52:46 2006
@@ -21,6 +21,7 @@
import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean;
import org.apache.geronimo.deployment.DeploymentContext;
import org.apache.geronimo.deployment.util.UnpackedJarFile;
+import org.apache.geronimo.deployment.util.DeploymentUtil;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.AbstractNameQuery;
import org.apache.geronimo.gbean.GBeanData;
@@ -350,7 +351,11 @@
}
public File createNewConfigurationDir(Artifact configId) {
- return null;
+ try {
+ return DeploymentUtil.createTempDir();
+ } catch (IOException e) {
+ return null;
+ }
}
public URL resolve(Artifact configId, URI uri) throws NoSuchConfigException, MalformedURLException {
Modified: geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/JettyManagerImpl.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/JettyManagerImpl.java?rev=388996&r1=388995&r2=388996&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/JettyManagerImpl.java (original)
+++ geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/JettyManagerImpl.java Sun Mar 26 16:52:46 2006
@@ -47,7 +47,7 @@
* Jetty implementation of WebManager. Knows how to manipulate
* other Jetty objects for management purposes.
*
- * @version $Rev: 385372 $ $Date$
+ * @version $Rev:386276 $ $Date$
*/
public class JettyManagerImpl implements WebManager {
private final static Log log = LogFactory.getLog(JettyManagerImpl.class);
@@ -229,7 +229,7 @@
}
return (AbstractName[]) results.toArray(new AbstractName[results.size()]);
} catch (Exception e) {
- throw new IllegalArgumentException("Unable to look up connectors for Jetty container '"+containerName +"': "+e);
+ throw (IllegalArgumentException)new IllegalArgumentException("Unable to look up connectors for Jetty container '"+containerName +"': ").initCause(e);
}
}
Modified: geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/AbstractNameQuery.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/AbstractNameQuery.java?rev=388996&r1=388995&r2=388996&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/AbstractNameQuery.java (original)
+++ geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/AbstractNameQuery.java Sun Mar 26 16:52:46 2006
@@ -212,18 +212,6 @@
public String toString() {
return uri.toString();
- //TODO configid need a URI format
-// StringBuffer buf = new StringBuffer("artifact=");
-// buf.append(artifact);
-// for (Iterator iterator = interfaceTypes.iterator(); iterator.hasNext();) {
-// String interfaceType = (String) iterator.next();
-// buf.append(",interface=").append(interfaceType);
-// }
-// for (Iterator iterator = name.entrySet().iterator(); iterator.hasNext();) {
-// Map.Entry entry = (Map.Entry) iterator.next();
-// buf.append(",").append(entry.getKey()).append("=").append(entry.getValue());
-// }
-// return buf.toString();
}
public URI toURI() {
Modified: geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java?rev=388996&r1=388995&r2=388996&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java (original)
+++ geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java Sun Mar 26 16:52:46 2006
@@ -27,18 +27,29 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+
import javax.management.ObjectName;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.gbean.*;
+import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.gbean.AbstractNameQuery;
+import org.apache.geronimo.gbean.GAttributeInfo;
+import org.apache.geronimo.gbean.GBeanData;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanLifecycle;
+import org.apache.geronimo.gbean.GConstructorInfo;
+import org.apache.geronimo.gbean.GOperationInfo;
+import org.apache.geronimo.gbean.GOperationSignature;
+import org.apache.geronimo.gbean.GReferenceInfo;
+import org.apache.geronimo.gbean.InvalidConfigurationException;
+import org.apache.geronimo.gbean.ReferencePatterns;
import org.apache.geronimo.kernel.DependencyManager;
-import org.apache.geronimo.kernel.NoSuchAttributeException;
-import org.apache.geronimo.kernel.NoSuchOperationException;
import org.apache.geronimo.kernel.GBeanNotFoundException;
import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.NoSuchAttributeException;
+import org.apache.geronimo.kernel.NoSuchOperationException;
import org.apache.geronimo.kernel.config.ManageableAttributeStore;
-import org.apache.geronimo.kernel.config.Configuration;
import org.apache.geronimo.kernel.management.State;
import org.apache.geronimo.kernel.management.StateManageable;
@@ -721,22 +732,14 @@
private void updateManageableAttribute(GBeanAttribute attribute, Object value) {
if (manageableStore == null) {
- Set set = kernel.listGBeans(new GBeanQuery(null, ManageableAttributeStore.class.getName()));
+ Set set = kernel.listGBeans(new AbstractNameQuery(ManageableAttributeStore.class.getName()));
if (set.size() == 0) {
return;
}
- manageableStore = (ManageableAttributeStore) kernel.getProxyManager().createProxy((ObjectName) set.iterator().next(),
+ manageableStore = (ManageableAttributeStore) kernel.getProxyManager().createProxy((AbstractName) set.iterator().next(),
ManageableAttributeStore.class);
}
- String configName = null;
- Set set = kernel.getDependencyManager().getParents(abstractName);
- for (Iterator iterator = set.iterator(); iterator.hasNext();) {
- ObjectName name = (ObjectName) iterator.next();
- if (Configuration.isConfigurationObjectName(name)) {
- configName = ObjectName.unquote(name.getKeyProperty("name"));
- break;
- }
- }
+ String configName = abstractName.getArtifact().toString();
if (configName != null) {
manageableStore.setValue(configName, abstractName, attribute.getAttributeInfo(), value);
} else {
Modified: geronimo/branches/1.1/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java?rev=388996&r1=388995&r2=388996&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java (original)
+++ geronimo/branches/1.1/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java Sun Mar 26 16:52:46 2006
@@ -343,7 +343,7 @@
Artifact targetConfigId = null;
String optionalModule = moduleURI == null ? null : moduleURI.toString();
String requiredModule = null;
- AbstractNameQuery containerId = null;
+ AbstractNameQuery containerQuery = null;
if (remoteRef != null && remoteRef.isSetEjbLink()) {
ejbLink = remoteRef.getEjbLink();
} else if (ejbRef.isSetEjbLink()) {
@@ -362,9 +362,9 @@
}
} else if (remoteRef != null) {
GerPatternType patternType = remoteRef.getPattern();
- containerId = buildAbstractNameQuery(patternType, null);
+ containerQuery = buildAbstractNameQuery(patternType, null);
}
- ejbReference = refContext.getEJBRemoteRef(requiredModule, optionalModule, ejbLink, targetConfigId, containerId, isSession, home, remote, ejbContext);
+ ejbReference = refContext.getEJBRemoteRef(requiredModule, optionalModule, ejbLink, targetConfigId, containerQuery, isSession, home, remote, ejbContext);
}
}
return ejbReference;
@@ -409,7 +409,7 @@
Artifact targetConfigId = null;
String optionalModule = moduleURI == null ? null : moduleURI.toString();
String requiredModule = null;
- AbstractNameQuery containerId = null;
+ AbstractNameQuery containerQuery = null;
if (localRef != null && localRef.isSetEjbLink()) {
ejbLink = localRef.getEjbLink();
} else if (ejbLocalRef.isSetEjbLink()) {
@@ -425,9 +425,9 @@
}
} else if (localRef != null) {
GerPatternType patternType = localRef.getPattern();
- containerId = buildAbstractNameQuery(patternType, null);
+ containerQuery = buildAbstractNameQuery(patternType, null);
}
- return refContext.getEJBRemoteRef(requiredModule, optionalModule, ejbLink, targetConfigId, containerId, isSession, localHome, local, ejbContext);
+ return refContext.getEJBRemoteRef(requiredModule, optionalModule, ejbLink, targetConfigId, containerQuery, isSession, localHome, local, ejbContext);
}
//TODO current implementation does not deal with portComponentRef links.
Modified: geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/jaas/DirectConfigurationEntry.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/jaas/DirectConfigurationEntry.java?rev=388996&r1=388995&r2=388996&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/jaas/DirectConfigurationEntry.java (original)
+++ geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/jaas/DirectConfigurationEntry.java Sun Mar 26 16:52:46 2006
@@ -33,7 +33,7 @@
public class DirectConfigurationEntry implements ConfigurationEntryFactory {
private final String applicationConfigName;
private final LoginModuleControlFlag controlFlag;
- private final LoginModuleGBean module;
+ private final LoginModuleSettings module;
private final boolean wrapPrincipals;
public DirectConfigurationEntry() {
@@ -43,7 +43,7 @@
this.wrapPrincipals = false;
}
- public DirectConfigurationEntry(String applicationConfigName, LoginModuleControlFlag controlFlag, LoginModuleGBean module, boolean wrapPrincipals) {
+ public DirectConfigurationEntry(String applicationConfigName, LoginModuleControlFlag controlFlag, LoginModuleSettings module, boolean wrapPrincipals) {
this.applicationConfigName = applicationConfigName;
this.controlFlag = controlFlag;
this.module = module;
@@ -67,7 +67,7 @@
infoFactory.addAttribute("controlFlag", LoginModuleControlFlag.class, true);
infoFactory.addAttribute("wrapPrincipals", boolean.class, true);
- infoFactory.addReference("Module", LoginModuleGBean.class, NameFactory.LOGIN_MODULE);
+ infoFactory.addReference("Module", LoginModuleSettings.class, NameFactory.LOGIN_MODULE);
infoFactory.setConstructor(new String[]{"applicationConfigName", "controlFlag", "Module", "wrapPrincipals"});
GBEAN_INFO = infoFactory.getBeanInfo();