etc/agent-versioning/build.xml | 2 modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml | 12 - modules/enterprise/remoting/cli/src/etc/generate-jaxb-client-types.bat | 14 - modules/enterprise/remoting/cli/src/etc/generate-jaxb-client-types.sh | 14 - modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml | 4 modules/enterprise/server/appserver/src/main/scripts/storage_setup.groovy | 4 modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/LocalClientTest.java | 22 +- modules/enterprise/server/ear/pom.xml | 4 modules/enterprise/server/ear/src/main/application/META-INF/jboss-deployment-structure.xml | 2 modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java | 2 modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java | 86 +++++----- modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java | 62 +++---- modules/enterprise/server/itests-2/src/test/resources/application.xml | 4 modules/enterprise/server/itests-2/src/test/resources/jboss-deployment-structure.xml | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/remote/RemoteSafeInvocationHandler.java | 10 - modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java | 10 - modules/enterprise/server/jar/src/main/resources/server-comm-configuration-overrides.properties | 2 modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java | 2 modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java | 2 modules/enterprise/server/startup-subsystem/pom.xml | 4 pom.xml | 2 21 files changed, 133 insertions(+), 133 deletions(-)
New commits: commit 957781e62543ff5023c4b59567ee76c6ab2a9d9a Author: John Mazzitelli mazz@redhat.com Date: Thu Jul 11 17:14:48 2013 -0400
BZ 983552 shorten the deployment names of the ejb3 jar and the startup subsystem
diff --git a/etc/agent-versioning/build.xml b/etc/agent-versioning/build.xml index d6c18a1..7a60e51 100644 --- a/etc/agent-versioning/build.xml +++ b/etc/agent-versioning/build.xml @@ -112,7 +112,7 @@ ant -Dserver.home.dir=/my/server/rhq-agent -Dnew.version=0.0.0.GA -Dnew.build=0 <target name="init-server"> <property name="env.RHQ_SERVER_HOME" location="dev-container"/> <property name="server.home.dir" location="${env.RHQ_SERVER_HOME}"/> - <property name="server.download.dir" location="${server.home.dir}/modules/org/rhq/rhq-enterprise-server-startup-subsystem/main/deployments/rhq.ear/rhq-downloads/rhq-agent"/> + <property name="server.download.dir" location="${server.home.dir}/modules/org/rhq/server-startup/main/deployments/rhq.ear/rhq-downloads/rhq-agent"/> <available property="_server.download.dir.exists" file="${server.download.dir}"/> <fail unless="_server.download.dir.exists" message="Cannot find the server download directory at ${server.download.dir}"/>
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml b/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml index 6d17177..481073e 100644 --- a/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml +++ b/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> - + <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" @@ -9,7 +9,7 @@
<context-param> <param-name>resteasy.jndi.resources</param-name> - <param-value>java:app/rhq-enterprise-server-ejb3/InventorySummaryHandler,java:app/rhq-enterprise-server-ejb3/AlertDefinitionHandler,java:app/rhq-enterprise-server-ejb3/ConfigurationHistoryHandler,java:app/rhq-enterprise-server-ejb3/RecentAlertHandler,java:app/rhq-enterprise-server-ejb3/SuspectMetricHandler,java:app/rhq-enterprise-server-ejb3/DriftComplianceHandler,java:app/rhq-enterprise-server-ejb3/RecentOperationsHandler,java:app/rhq-enterprise-server-ejb3/RecentDriftHandler,java:app/rhq-enterprise-server-ejb3/PlatformUtilizationHandler</param-value> + <param-value>java:app/rhq-server/InventorySummaryHandler,java:app/rhq-server/AlertDefinitionHandler,java:app/rhq-server/ConfigurationHistoryHandler,java:app/rhq-server/RecentAlertHandler,java:app/rhq-server/SuspectMetricHandler,java:app/rhq-server/DriftComplianceHandler,java:app/rhq-server/RecentOperationsHandler,java:app/rhq-server/RecentDriftHandler,java:app/rhq-server/PlatformUtilizationHandler</param-value> <!--<description>List of jndi names of EJBs local interfaces that define REST stuff</description>--> </context-param> <context-param> @@ -192,7 +192,7 @@ <servlet> <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI DriftGWTService</servlet-name> <servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.DriftGWTServiceImpl</servlet-class> - </servlet> + </servlet> <servlet> <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI PlatformUtilizationGWTService</servlet-name> <servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.PlatformUtilizationGWTServiceImpl</servlet-class> @@ -205,7 +205,7 @@ <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI TopologyGWTService</servlet-name> <servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.TopologyGWTServiceImpl</servlet-class> </servlet> - +
<servlet> <servlet-name>Resteasy</servlet-name> @@ -373,7 +373,7 @@ <servlet-mapping> <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI DriftGWTService</servlet-name> <url-pattern>/org.rhq.enterprise.gui.coregui.CoreGUI/DriftGWTService</url-pattern> - </servlet-mapping> + </servlet-mapping> <servlet-mapping> <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI PlatformUtilizationGWTService</servlet-name> <url-pattern>/org.rhq.enterprise.gui.coregui.CoreGUI/PlatformUtilizationGWTService</url-pattern> @@ -398,7 +398,7 @@ </welcome-file-list>
- <!-- Uncomment the below to automatically redirect all HTTP requests to the + <!-- Uncomment the below to automatically redirect all HTTP requests to the corresponding HTTPS URLs. --> <!-- <security-constraint> diff --git a/modules/enterprise/remoting/cli/src/etc/generate-jaxb-client-types.bat b/modules/enterprise/remoting/cli/src/etc/generate-jaxb-client-types.bat index 2f197478..68e8706 100644 --- a/modules/enterprise/remoting/cli/src/etc/generate-jaxb-client-types.bat +++ b/modules/enterprise/remoting/cli/src/etc/generate-jaxb-client-types.bat @@ -1,16 +1,16 @@ rem This script should consume all the wsdls and compile the JAXB types all rem into one directory.
-call ../../../../dev-container/jbossas/bin/wsconsume.bat -k http://127.0.0.1:7080/rhq-rhq-enterprise-server-ejb3/RoleManagerBean?wsdl -p org.rhq.enterprise.server.ws +call ../../../../dev-container/jbossas/bin/wsconsume.bat -k http://127.0.0.1:7080/rhq-rhq-server/RoleManagerBean?wsdl -p org.rhq.enterprise.server.ws
-call ../../../../dev-container/jbossas/bin/wsconsume.bat -k http://127.0.0.1:7080/rhq-rhq-enterprise-server-ejb3/ContentManagerBean?wsdl -p org.rhq.enterprise.server.ws +call ../../../../dev-container/jbossas/bin/wsconsume.bat -k http://127.0.0.1:7080/rhq-rhq-server/ContentManagerBean?wsdl -p org.rhq.enterprise.server.ws
-call ../../../../dev-container/jbossas/bin/wsconsume.bat -k http://127.0.0.1:7080/rhq-rhq-enterprise-server-ejb3/SubjectManagerBean?wsdl -p org.rhq.enterprise.server.ws +call ../../../../dev-container/jbossas/bin/wsconsume.bat -k http://127.0.0.1:7080/rhq-rhq-server/SubjectManagerBean?wsdl -p org.rhq.enterprise.server.ws
-call ../../../../dev-container/jbossas/bin/wsconsume.bat -k http://127.0.0.1:7080/rhq-rhq-enterprise-server-ejb3/OperationManagerBean?ws... -p org.rhq.enterprise.server.ws +call ../../../../dev-container/jbossas/bin/wsconsume.bat -k http://127.0.0.1:7080/rhq-rhq-server/OperationManagerBean?wsdl -p org.rhq.enterprise.server.ws
-call ../../../../dev-container/jbossas/bin/wsconsume.bat -k http://127.0.0.1:7080/rhq-rhq-enterprise-server-ejb3/RepoManagerBean?wsdl -p org.rhq.enterprise.server.ws +call ../../../../dev-container/jbossas/bin/wsconsume.bat -k http://127.0.0.1:7080/rhq-rhq-server/RepoManagerBean?wsdl -p org.rhq.enterprise.server.ws
-call ../../../../dev-container/jbossas/bin/wsconsume.bat -k http://127.0.0.1:7080/rhq-rhq-enterprise-server-ejb3/ConfigurationManagerBea... -p org.rhq.enterprise.server.ws +call ../../../../dev-container/jbossas/bin/wsconsume.bat -k http://127.0.0.1:7080/rhq-rhq-server/ConfigurationManagerBean?wsdl -p org.rhq.enterprise.server.ws
-call ../../../../dev-container/jbossas/bin/wsconsume.bat -k http://127.0.0.1:7080/rhq-rhq-enterprise-server-ejb3/ResourceManagerBean?wsd... -p org.rhq.enterprise.server.ws \ No newline at end of file +call ../../../../dev-container/jbossas/bin/wsconsume.bat -k http://127.0.0.1:7080/rhq-rhq-server/ResourceManagerBean?wsdl -p org.rhq.enterprise.server.ws \ No newline at end of file diff --git a/modules/enterprise/remoting/cli/src/etc/generate-jaxb-client-types.sh b/modules/enterprise/remoting/cli/src/etc/generate-jaxb-client-types.sh index e229fb4..f83293b 100644 --- a/modules/enterprise/remoting/cli/src/etc/generate-jaxb-client-types.sh +++ b/modules/enterprise/remoting/cli/src/etc/generate-jaxb-client-types.sh @@ -3,16 +3,16 @@ # This script should consume all the wsdls and compile the JAXB types all # into one directory.
-../../../../dev-container/jbossas/bin/wsconsume.sh -k http://localhost:7080/rhq-rhq-enterprise-server-ejb3/RoleManagerBean?wsdl -p org.rhq.enterprise.server.ws +../../../../dev-container/jbossas/bin/wsconsume.sh -k http://localhost:7080/rhq-rhq-server/RoleManagerBean?wsdl -p org.rhq.enterprise.server.ws
-../../../../dev-container/jbossas/bin/wsconsume.sh -k http://localhost:7080/rhq-rhq-enterprise-server-ejb3/ContentManagerBean?wsdl -p org.rhq.enterprise.server.ws +../../../../dev-container/jbossas/bin/wsconsume.sh -k http://localhost:7080/rhq-rhq-server/ContentManagerBean?wsdl -p org.rhq.enterprise.server.ws
-../../../../dev-container/jbossas/bin/wsconsume.sh -k http://localhost:7080/rhq-rhq-enterprise-server-ejb3/SubjectManagerBean?wsdl -p org.rhq.enterprise.server.ws +../../../../dev-container/jbossas/bin/wsconsume.sh -k http://localhost:7080/rhq-rhq-server/SubjectManagerBean?wsdl -p org.rhq.enterprise.server.ws
-../../../../dev-container/jbossas/bin/wsconsume.sh -k http://localhost:7080/rhq-rhq-enterprise-server-ejb3/OperationManagerBean?ws... -p org.rhq.enterprise.server.ws +../../../../dev-container/jbossas/bin/wsconsume.sh -k http://localhost:7080/rhq-rhq-server/OperationManagerBean?wsdl -p org.rhq.enterprise.server.ws
-../../../../dev-container/jbossas/bin/wsconsume.sh -k http://localhost:7080/rhq-rhq-enterprise-server-ejb3/RepoManagerBean?wsdl -p org.rhq.enterprise.server.ws +../../../../dev-container/jbossas/bin/wsconsume.sh -k http://localhost:7080/rhq-rhq-server/RepoManagerBean?wsdl -p org.rhq.enterprise.server.ws
-../../../../dev-container/jbossas/bin/wsconsume.sh -k http://localhost:7080/rhq-rhq-enterprise-server-ejb3/ConfigurationManagerBea... -p org.rhq.enterprise.server.ws +../../../../dev-container/jbossas/bin/wsconsume.sh -k http://localhost:7080/rhq-rhq-server/ConfigurationManagerBean?wsdl -p org.rhq.enterprise.server.ws
-../../../../dev-container/jbossas/bin/wsconsume.sh -k http://localhost:7080/rhq-rhq-enterprise-server-ejb3/ResourceManagerBean?wsd... -p org.rhq.enterprise.server.ws \ No newline at end of file +../../../../dev-container/jbossas/bin/wsconsume.sh -k http://localhost:7080/rhq-rhq-server/ResourceManagerBean?wsdl -p org.rhq.enterprise.server.ws \ No newline at end of file diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml index bf06886..a81b6cd 100644 --- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml +++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml @@ -80,7 +80,7 @@ <property name="jboss.modules.dir" location="${project.build.outputDirectory}/modules" /> <mkdir dir="${jboss.modules.dir}" />
- <property name="rhq.ear.dir" location="${jboss.modules.dir}/org/rhq/rhq-enterprise-server-startup-subsystem/main/deployments/${rhq.earName}" /> + <property name="rhq.ear.dir" location="${jboss.modules.dir}/org/rhq/server-startup/main/deployments/${rhq.earName}" />
<condition property="use-postgres" value="true"> <contains string="${rhq.server.database.type-mapping}" substring="postgres" casesensitive="false" /> @@ -164,7 +164,7 @@ <fail unless="jboss.home.is.valid" message="${jboss.home} does not contain a valid JBossAS installation - aborting!" />
<echo>Adding main EAR app module to ${jboss.modules.dir} ...</echo> - <unzip src="${settings.localRepository}/org/rhq/rhq-enterprise-server-startup-subsystem/${project.version}/rhq-enterprise-server-startup-subsystem-${project.version}.zip" + <unzip src="${settings.localRepository}/org/rhq/server-startup/${project.version}/server-startup-${project.version}.zip" dest="${jboss.modules.dir}" />
<echo>Adding installer module to ${jboss.modules.dir} ...</echo> diff --git a/modules/enterprise/server/appserver/src/main/scripts/storage_setup.groovy b/modules/enterprise/server/appserver/src/main/scripts/storage_setup.groovy index ccb90b9..857c268 100644 --- a/modules/enterprise/server/appserver/src/main/scripts/storage_setup.groovy +++ b/modules/enterprise/server/appserver/src/main/scripts/storage_setup.groovy @@ -168,11 +168,11 @@ def prepareModulesDir(basedir) { ) ant.symlink(link: "$modulesDir/org/rhq/rhq-server-control", resource: "$defaultModulesDir/org/rhq/rhq-server-control")
- def downloadsDir = "$modulesDir/org/rhq/rhq-enterprise-server-startup-subsystem/main/deployments/rhq.ear/rhq-downloads" + def downloadsDir = "$modulesDir/org/rhq/server-startup/main/deployments/rhq.ear/rhq-downloads" ant.mkdir(dir: downloadsDir) ant.symlink( link: "$downloadsDir/rhq-agent", - resource: "$defaultModulesDir/org/rhq/rhq-enterprise-server-startup-subsystem/main/deployments/rhq.ear/rhq-downloads/rhq-agent" + resource: "$defaultModulesDir/org/rhq/server-startup/main/deployments/rhq.ear/rhq-downloads/rhq-agent" ) }
diff --git a/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/LocalClientTest.java b/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/LocalClientTest.java index 6e2fcf6..f350843 100644 --- a/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/LocalClientTest.java +++ b/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/LocalClientTest.java @@ -47,7 +47,7 @@ import org.rhq.enterprise.client.LocalClient; import org.rhq.test.JMockTest;
/** - * + * * * @author Lukas Krejci */ @@ -59,29 +59,29 @@ public class LocalClientTest extends JMockTest { return CONTEXT_MOCK_FOR_TEST; } } - + public static Context CONTEXT_MOCK_FOR_TEST = null; - + @BeforeClass public void setUpNaming() { System.setProperty(Context.INITIAL_CONTEXT_FACTORY, FakeContextFactory.class.getName()); } - + /** * Needs to be called from within a test method so that the "context" variable is available. - * + * * @throws NamingException */ private void setupFakeJndiLookup() throws NamingException { CONTEXT_MOCK_FOR_TEST = context.mock(Context.class); - + context.checking(new Expectations() {{ allowing(CONTEXT_MOCK_FOR_TEST).lookup(with(any(String.class))); will(new CustomAction("Fake JNDI lookup") {
@Override public Object invoke(Invocation invocation) throws Throwable { - // JNDI name format like: java:global/rhq/rhq-enterprise-server-ejb3/SystemManagerBean!org.rhq.enterprise.server.system.SystemManagerLocal + // JNDI name format like: java:global/rhq/rhq-server/SystemManagerBean!org.rhq.enterprise.server.system.SystemManagerLocal String jndiName = (String) invocation.getParameter(0); String beanName = jndiName.substring(0,jndiName.indexOf('!')); beanName = beanName.substring(beanName.lastIndexOf('/') + 1); @@ -105,7 +105,7 @@ public class LocalClientTest extends JMockTest { }); } }); - + allowing(CONTEXT_MOCK_FOR_TEST).close(); }}); } @@ -130,15 +130,15 @@ public class LocalClientTest extends JMockTest { @Test public void testResilienceAgainstContextClassloaders() throws Exception { setupFakeJndiLookup(); - + ClassLoader origCl = Thread.currentThread().getContextClassLoader(); try { ClassLoader differentCl = new URLClassLoader(new URL[0], getClass().getClassLoader()); - + Thread.currentThread().setContextClassLoader(differentCl);
LocalClient lc = new LocalClient(null); - + //this call creates the proxy and is theoretically prone to the context classloader Object am = lc.getScriptingAPI().get(RhqManager.AlertManager);
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index 0e4bc83..e2a4cdb 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -238,7 +238,7 @@ <ejbModule> <groupId>${project.groupId}</groupId> <artifactId>rhq-enterprise-server</artifactId> - <bundleFileName>rhq-enterprise-server-ejb3.jar</bundleFileName> + <bundleFileName>rhq-server.jar</bundleFileName> </ejbModule>
<ejbClientModule> @@ -832,7 +832,7 @@ <rhq.rootDir>../../../..</rhq.rootDir> <rhq.containerDir>${rhq.rootDir}/${rhq.devContainerServerPath}</rhq.containerDir> <rhq.deploymentName>${project.build.finalName}.ear</rhq.deploymentName> - <rhq.deploymentDir>${rhq.containerDir}/modules/org/rhq/rhq-enterprise-server-startup-subsystem/main/deployments/${rhq.deploymentName}</rhq.deploymentDir> + <rhq.deploymentDir>${rhq.containerDir}/modules/org/rhq/server-startup/main/deployments/${rhq.deploymentName}</rhq.deploymentDir> </properties>
<build> diff --git a/modules/enterprise/server/ear/src/main/application/META-INF/jboss-deployment-structure.xml b/modules/enterprise/server/ear/src/main/application/META-INF/jboss-deployment-structure.xml index d0a665d..80a648f 100644 --- a/modules/enterprise/server/ear/src/main/application/META-INF/jboss-deployment-structure.xml +++ b/modules/enterprise/server/ear/src/main/application/META-INF/jboss-deployment-structure.xml @@ -33,7 +33,7 @@ </sub-deployment>
<!-- This corresponds to the Server EJB3 JAR --> - <sub-deployment name="rhq-enterprise-server-ejb3.jar"> + <sub-deployment name="rhq-server.jar"> <dependencies> <module name="org.jboss.msc" export="true" /> <module name="org.jboss.as.controller" export="true" /> diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java index 284ddbd..160b5dd 100644 --- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java +++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java @@ -49,7 +49,7 @@ import org.rhq.enterprise.server.installer.ServerInstallUtil.SupportedDatabaseTy */ public class InstallerServiceImpl implements InstallerService {
- private static final String RHQ_EXTENSION_NAME = "org.rhq.rhq-enterprise-server-startup-subsystem"; + private static final String RHQ_EXTENSION_NAME = "org.rhq.server-startup"; private static final String RHQ_SUBSYSTEM_NAME = "rhq-startup"; private static final String EAR_NAME = "rhq.ear"; private static final String SYSPROP_PROPFILE = "rhq.server.properties-file"; diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java index 334e768..1cdc1d5 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java @@ -34,7 +34,7 @@ import org.rhq.enterprise.server.system.SystemManagerBean; import org.rhq.enterprise.server.util.LookupUtil;
/** - * + * * * @author Lukas Krejci */ @@ -59,21 +59,21 @@ public class JndiAccessTest extends ScriptableAbstractEJB3Test { public void testEjbsAccessibleThroughPrivilegedCode() { LookupUtil.getSubjectManager().getOverlord(); } - + public void testEjbsAccessibleThroughLocalClient() throws ScriptException, IOException { Subject overlord = LookupUtil.getSubjectManager().getOverlord(); - + ScriptEngine engine = getEngine(overlord); - + engine.eval("SubjectManager.getSubjectByName('rhqadmin');"); } - + public void testLocalEjbsInaccessibleThroughJndiLookup() throws ScriptException, IOException { Subject overlord = LookupUtil.getSubjectManager().getOverlord(); - + ScriptEngine engine = getEngine(overlord); - - String jndiName = "java:global/rhq/rhq-enterprise-server-ejb3/" + + String jndiName = "java:global/rhq/rhq-server/" + SystemManagerBean.class.getSimpleName() + "!" + SystemManagerBean.class.getName().replace("Bean", "Local"); @@ -85,19 +85,19 @@ public class JndiAccessTest extends ScriptableAbstractEJB3Test { + jndiName + "');\n" + "systemManager.isDebugModeEnabled();"); - + Assert.fail("The script shouldn't have been able to call local SLSB method."); } catch (ScriptException e) { checkIsDesiredSecurityException(e); } } - + public void testLocalEjbsInaccessibleThroughJndiLookupWithCustomUrlPackages() throws ScriptException, IOException { Subject overlord = LookupUtil.getSubjectManager().getOverlord();
ScriptEngine engine = getEngine(overlord);
- String jndiName = "java:global/rhq/rhq-enterprise-server-ejb3/" + String jndiName = "java:global/rhq/rhq-server/" + SystemManagerBean.class.getSimpleName() + "!" + SystemManagerBean.class.getName().replace("Bean", "Local"); @@ -122,10 +122,10 @@ public class JndiAccessTest extends ScriptableAbstractEJB3Test {
public void testRemoteEjbsInaccessibleThroughJndiLookup() throws ScriptException, IOException { Subject overlord = LookupUtil.getSubjectManager().getOverlord(); - + ScriptEngine engine = getEngine(overlord);
- String jndiName = "java:global/rhq/rhq-enterprise-server-ejb3/" + String jndiName = "java:global/rhq/rhq-server/" + SystemManagerBean.class.getSimpleName() + "!" + SystemManagerBean.class.getName().replace("Bean", "Remote"); @@ -137,28 +137,28 @@ public class JndiAccessTest extends ScriptableAbstractEJB3Test { + jndiName + "');\n" + "systemManager.getSystemSettings(subject);"); - + Assert.fail("The script shouldn't have been able to call remote SLSB method directly."); } catch (ScriptException e) { checkIsDesiredSecurityException(e); } } - + public void testScriptCantUseSessionManagerMethods() throws Exception {
- Subject overlord = LookupUtil.getSubjectManager().getOverlord(); - + Subject overlord = LookupUtil.getSubjectManager().getOverlord(); + final ScriptEngine engine = getEngine(overlord); - + class G { private String sessionManager = "" + "org.rhq.enterprise.server.auth.SessionManager.getInstance()."; - + public void testInvoke(String methodCall) throws ScriptException { String code = sessionManager + methodCall;
try { - engine.eval(code); + engine.eval(code); Assert.fail("The script shouldn't have been able to call a method on a SessionManager: " + methodCall); } catch (ScriptException e) { checkIsDesiredSecurityException(e); @@ -166,7 +166,7 @@ public class JndiAccessTest extends ScriptableAbstractEJB3Test { } }; G manager = new G(); - + manager.testInvoke("getLastAccess(0);"); manager.testInvoke("getOverlord()"); manager.testInvoke("getSubject(2);"); @@ -175,27 +175,27 @@ public class JndiAccessTest extends ScriptableAbstractEJB3Test { manager.testInvoke("put(new org.rhq.core.domain.auth.Subject());"); manager.testInvoke("put(new org.rhq.core.domain.auth.Subject(), 0);"); } - + public void testScriptCantObtainRawJDBCConnectionsWithoutCredentials() throws Exception { Subject overlord = LookupUtil.getSubjectManager().getOverlord(); - + ScriptEngine engine = getEngine(overlord); - + try { engine.eval("" + "var ctx = new javax.naming.InitialContext();\n" + "var datasource = ctx.lookup('" + RHQConstants.DATASOURCE_JNDI_NAME + "');\n" + "con = datasource.getConnection();"); - + Assert.fail("The script shouldn't have been able to obtain the datasource from the JNDI."); } catch (ScriptException e) { checkIsDesiredSecurityException(e); } } - + public void testScriptCantUseEntityManager() throws Exception { - Subject overlord = LookupUtil.getSubjectManager().getOverlord(); - + Subject overlord = LookupUtil.getSubjectManager().getOverlord(); + ScriptEngine engine = getEngine(overlord);
try { @@ -204,12 +204,12 @@ public class JndiAccessTest extends ScriptableAbstractEJB3Test { + "var entityManagerFactory = ctx.lookup('" + RHQConstants.ENTITY_MANAGER_JNDI_NAME + "');\n" + "var entityManager = entityManagerFactory.createEntityManager();\n" + "entityManager.find(java.lang.Class.forName('org.rhq.core.domain.resource.Resource'), java.lang.Integer.valueOf('10001'));"); - + Assert.fail("The script shouldn't have been able to use the EntityManager."); } catch (ScriptException e) { checkIsDesiredSecurityException(e); - } - + } + //try harder with manually specifying the initial context factory try { engine.eval("" @@ -220,20 +220,20 @@ public class JndiAccessTest extends ScriptableAbstractEJB3Test { + "var entityManagerFactory = ctx.lookup('" + RHQConstants.ENTITY_MANAGER_JNDI_NAME + "');\n" + "var entityManager = entityManagerFactory.createEntityManager();\n" + "entityManager.find(java.lang.Class.forName('org.rhq.core.domain.resource.Resource'), java.lang.Integer.valueOf('10001'));"); - + Assert.fail("The script shouldn't have been able to use the EntityManager even using custom initial context factory."); } catch (ScriptException e) { checkIsDesiredSecurityException(e); - } + } }
public void testProxyFactoryWorksWithSecuredScriptEngine() throws Exception { - Subject overlord = LookupUtil.getSubjectManager().getOverlord(); - + Subject overlord = LookupUtil.getSubjectManager().getOverlord(); + ScriptEngine engine = getEngine(overlord); - + try { - engine.eval("var resource = ProxyFactory.getResource(10001);"); + engine.eval("var resource = ProxyFactory.getResource(10001);"); } catch (ScriptException e) { //if the script fails (there is no resource with ID 10001) //it should not be because of an access control exception @@ -243,10 +243,10 @@ public class JndiAccessTest extends ScriptableAbstractEJB3Test {
//THIS IS A NEW REQUIREMENT THAT DOESN'T CURRENTLY WORK... // public void testInitialContextFactoryBuilderNotReplaceableUsingScripts() throws Exception { - // Subject overlord = LookupUtil.getSubjectManager().getOverlord(); - // + // Subject overlord = LookupUtil.getSubjectManager().getOverlord(); + // // ScriptEngine engine = getEngine(overlord); - // + // // try { // engine.eval("" // + "var mgrCls = java.lang.Class.forName('javax.naming.spi.NamingManager');\n" @@ -262,11 +262,11 @@ public class JndiAccessTest extends ScriptableAbstractEJB3Test { // NamingHack.bruteForceInitialContextFactoryBuilder(); // } // } - + private static void checkIsDesiredSecurityException(ScriptException e) { String message = e.getMessage(); String permissionTrace = "org.rhq.allow.server.internals.access"; - + if (!message.contains(permissionTrace)) { Assert .fail( @@ -278,7 +278,7 @@ public class JndiAccessTest extends ScriptableAbstractEJB3Test { private static void checkIsNotASecurityException(ScriptException e) { String message = e.getMessage(); String permissionTrace = "org.rhq.allow.server.internals.access"; - + if (message.contains(permissionTrace)) { Assert .fail( diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java index 9ddba97..4dfbd46 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java @@ -124,20 +124,20 @@ public abstract class AbstractEJB3Test extends Arquillian { // we need a way to deploy dependent ears needed to support the server/jar classes. But // building this jar up (as is done in core/domain) was too difficult due to the huge number // of dependencies. It was easier, and made sense, to use the already built rhq.ear - // and run as true integration tests. We do thin rhq.ear by removing all of the WAR files, and + // and run as true integration tests. We do thin rhq.ear by removing all of the WAR files, and // deploy only the EJB jars, and the services, which are really the objects under test.
@Deployment protected static EnterpriseArchive getBaseDeployment() {
- // Ensure the test working dir exists + // Ensure the test working dir exists tmpdirRoot.mkdirs();
// deploy the test classes in their own jar, under /lib JavaArchive testClassesJar = ShrinkWrap.create(JavaArchive.class, "test-classes.jar"); testClassesJar = addClasses(testClassesJar, new File("target/test-classes/org"), null);
- // add non itests-2 RHQ classes used by the test classes, as well as needed resources + // add non itests-2 RHQ classes used by the test classes, as well as needed resources testClassesJar.addClass(ThrowableUtil.class); testClassesJar.addClass(MessageDigestGenerator.class); testClassesJar.addClass(StreamUtil.class); @@ -340,22 +340,22 @@ public abstract class AbstractEJB3Test extends Arquillian { .withoutTransitivity().asSingle(EnterpriseArchive.class); // merge rhq.ear into testEar but include only the EJB jars and the supporting libraries. Note that we // don't include the services sar because tests are responsible for prepare/unprepare of all required services, - // we don't want the production services performing any unexpected work. + // we don't want the production services performing any unexpected work. testEar = testEar.merge(rhqEar, Filters.include("/lib.*|/rhq.*ejb3\.jar.*")); // remove startup beans and shutdown listeners, we don't want this to be a full server deployment. The tests // start/stop what they need, typically with test services or mocks. testEar.delete(ArchivePaths - .create("/rhq-enterprise-server-ejb3.jar/org/rhq/enterprise/server/core/StartupBean.class")); + .create("/rhq-server.jar/org/rhq/enterprise/server/core/StartupBean.class")); testEar.delete(ArchivePaths - .create("/rhq-enterprise-server-ejb3.jar/org/rhq/enterprise/server/core/StartupBean$1.class")); + .create("/rhq-server.jar/org/rhq/enterprise/server/core/StartupBean$1.class")); testEar.delete(ArchivePaths - .create("/rhq-enterprise-server-ejb3.jar/org/rhq/enterprise/server/core/ShutdownListener.class")); + .create("/rhq-server.jar/org/rhq/enterprise/server/core/ShutdownListener.class"));
//replace the above startup beans with stripped down versions testEar.add(new ClassAsset(StrippedDownStartupBean.class), ArchivePaths - .create("/rhq-enterprise-server-ejb3.jar/org/rhq/enterprise/server/test/StrippedDownStartupBean.class")); + .create("/rhq-server.jar/org/rhq/enterprise/server/test/StrippedDownStartupBean.class")); testEar.add(new ClassAsset(StrippedDownStartupBeanPreparation.class), ArchivePaths - .create("/rhq-enterprise-server-ejb3.jar/org/rhq/enterprise/server/test/" + .create("/rhq-server.jar/org/rhq/enterprise/server/test/" + "StrippedDownStartupBeanPreparation.class")); testEar.addAsManifestResource(new ByteArrayAsset("<beans/>".getBytes()), ArchivePaths.create("beans.xml"));
@@ -368,7 +368,7 @@ public abstract class AbstractEJB3Test extends Arquillian { // add the application xml declaring the ejb jars testEar.setApplicationXML("application.xml");
- // add additional 3rd party dependent jars needed to support test classes + // add additional 3rd party dependent jars needed to support test classes Collection thirdPartyDeps = new ArrayList(); thirdPartyDeps.add("joda-time:joda-time"); thirdPartyDeps.add("org.jboss.shrinkwrap:shrinkwrap-impl-base"); @@ -496,15 +496,15 @@ public abstract class AbstractEJB3Test extends Arquillian { /** * <p>DO NOT OVERRIDE.</p> * <p>DO NOT DEFINE AN @BeforeMethod</p> - * + * * Instead, override {@link #beforeMethod()}. If you must override, for example, if you * need to use special attributes on your annotation, then ensure you protect the code with * and {@link #inContainer()} call. */ @BeforeMethod protected void __beforeMethod(Method method) throws Throwable { - // Note that Arquillian calls the testng BeforeMethod twice (as of 1.0.2.Final, once - // out of container and once in container. In general the expectation is to execute it + // Note that Arquillian calls the testng BeforeMethod twice (as of 1.0.2.Final, once + // out of container and once in container. In general the expectation is to execute it // one time, and doing it in container allows for the expected injections and context. if (inContainer()) { try { @@ -539,7 +539,7 @@ public abstract class AbstractEJB3Test extends Arquillian { /** * <p>DO NOT OVERRIDE.</p> * <p>DO NOT DEFINE AN @AfterMethod</p> - * + * * Instead, override {@link #afterMethod()}. */ @AfterMethod(alwaysRun = true) @@ -559,33 +559,33 @@ public abstract class AbstractEJB3Test extends Arquillian { }
protected boolean inContainer() { - // If the injection is done we're running in the container. + // If the injection is done we're running in the container. return (null != initialContext); }
/** - * Override Point! Do not implement a @BeforeMethod, instead override this method. + * Override Point! Do not implement a @BeforeMethod, instead override this method. */ protected void beforeMethod() throws Exception { // do nothing if we're not overridden }
/** - * Override Point! Do not implement a @BeforeMethod, instead override this method. + * Override Point! Do not implement a @BeforeMethod, instead override this method. */ protected void beforeMethod(Method method) throws Exception { // do nothing if we're not overridden }
/** - * Override Point! Do not implement an @AfterMethod, instead override this method. note: alwaysRun=true + * Override Point! Do not implement an @AfterMethod, instead override this method. note: alwaysRun=true */ protected void afterMethod() throws Exception { // do nothing if we're not overridden }
/** - * Override Point! Do not implement an @AfterMethod, instead override this method. note: alwaysRun=true + * Override Point! Do not implement an @AfterMethod, instead override this method. note: alwaysRun=true */ protected void afterMethod(ITestResult result, Method meth) throws Exception { // do nothing if we're not overridden @@ -706,7 +706,7 @@ public abstract class AbstractEJB3Test extends Arquillian { }
/* The old AbstractEJB3Test impl extended AssertJUnit. Continue to support the used methods - * with various call-thru methods. + * with various call-thru methods. */
protected void assertNotNull(Object o) { @@ -1020,7 +1020,7 @@ public abstract class AbstractEJB3Test extends Arquillian { scanner.setAgentPluginDir(pluginDirPath); // we don't want to scan for these scanner.setServerPluginDir("ignore no plugins here"); // we don't want to scan for these scanner.setUserPluginDir("ignore no plugins here"); // we don't want to scan for these - scanner.setScanPeriod("9999999"); // we want to manually scan - don't allow for auto-scan to happen + scanner.setScanPeriod("9999999"); // we want to manually scan - don't allow for auto-scan to happen
return preparePluginScannerService(scanner); } @@ -1028,7 +1028,7 @@ public abstract class AbstractEJB3Test extends Arquillian { /** * Note that the standard plugin scanner service is deployed automatically with the test rhq ear, * this is only necessary if you want a custom service. - * + * * @param scannerService */ public PluginDeploymentScannerMBean preparePluginScannerService(PluginDeploymentScannerMBean scannerService) { @@ -1072,7 +1072,7 @@ public abstract class AbstractEJB3Test extends Arquillian { * annotations by creating sessions for different users with different permissions. * * @param subject a JON subject - * @return the session activated subject, a copy of the subject passed in. + * @return the session activated subject, a copy of the subject passed in. */ public Subject createSession(Subject subject) { return SessionManager.getInstance().put(subject); @@ -1086,9 +1086,9 @@ public abstract class AbstractEJB3Test extends Arquillian { * A utility for writing out various objects that need to be persisted for use between * tests. Arquillian (1.0.2) basically "new"s the testng test class on each test, so instance * variables can not be used between tests. Instead, the db or this mechanism needs to be used. - * + * * The file will be placed in the standard temp dir. If it already exists it will be replaced. - * + * * @param filename Do not include the directory. The value will be prepended with the class name. * @param objects * @throws Exception @@ -1106,9 +1106,9 @@ public abstract class AbstractEJB3Test extends Arquillian { /** * A utility for reading in objects written with {@link #writeObjects(String, Object...). They are * placed in the result List in the same order they were written. - * + * * @param filename The same filename used in the write. Do not include the directory. - * @param numObjects the number of objects to read out. Can be less than total written, not greater. + * @param numObjects the number of objects to read out. Can be less than total written, not greater. * @throws Exception */ protected List<Object> readObjects(String filename, int numObjects) throws Exception { @@ -1130,16 +1130,16 @@ public abstract class AbstractEJB3Test extends Arquillian {
/** * A utility for cleaning up files created with {@link #writeObjects(String, Object...). - * - * @param filename The same filename used in the write. Do not include the directory. - * @return true if deleted, false otherwise. + * + * @param filename The same filename used in the write. Do not include the directory. + * @return true if deleted, false otherwise. */ protected boolean deleteObjects(String filename) { File file = new File(getTempDir(), filename); return file.delete(); }
- /** + /** * @return a temp directory for testing that is specific to this test class. Specifically tmpdirRoot/this.getClass().getSimpleName(). */ public File getTempDir() { diff --git a/modules/enterprise/server/itests-2/src/test/resources/application.xml b/modules/enterprise/server/itests-2/src/test/resources/application.xml index 06b81e6..e28f755 100644 --- a/modules/enterprise/server/itests-2/src/test/resources/application.xml +++ b/modules/enterprise/server/itests-2/src/test/resources/application.xml @@ -6,6 +6,6 @@ <ejb>rhq-core-domain-ejb3.jar</ejb> </module> <module> - <ejb>rhq-enterprise-server-ejb3.jar</ejb> - </module> + <ejb>rhq-server.jar</ejb> + </module> </application> \ No newline at end of file diff --git a/modules/enterprise/server/itests-2/src/test/resources/jboss-deployment-structure.xml b/modules/enterprise/server/itests-2/src/test/resources/jboss-deployment-structure.xml index 48a80f2..1b5ceb9 100644 --- a/modules/enterprise/server/itests-2/src/test/resources/jboss-deployment-structure.xml +++ b/modules/enterprise/server/itests-2/src/test/resources/jboss-deployment-structure.xml @@ -20,7 +20,7 @@ </deployment>
<!-- This corresponds to the Server EJB3 JAR --> - <sub-deployment name="rhq-enterprise-server-ejb3.jar"> + <sub-deployment name="rhq-server.jar"> <dependencies> <module name="org.jboss.msc" export="true" /> <module name="org.jboss.as.controller" export="true" /> diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/remote/RemoteSafeInvocationHandler.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/remote/RemoteSafeInvocationHandler.java index 3a435ef..2602cf8 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/remote/RemoteSafeInvocationHandler.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/remote/RemoteSafeInvocationHandler.java @@ -44,8 +44,8 @@ import org.rhq.enterprise.server.safeinvoker.HibernateDetachUtility; * Although, we execute only locals to bypass the serialization performed by a remote invocation. Even * though this handler is co-located, for remotes, remoting will serialize the return data immediately. * This is bad for us because since we return domain objects we ned to scrub the data, removing - * hibernate proxies (see {@link HibernateDetachUtility}. - * + * hibernate proxies (see {@link HibernateDetachUtility}. + * * @author Greg Hinkle * @autor Jay Shaughnessy */ @@ -103,7 +103,7 @@ public class RemoteSafeInvocationHandler implements ServerInvocationHandler { Object target = ic.lookup(jndiName); Method m = target.getClass().getMethod(methodInfo[1], sig);
- // switch to the local + // switch to the local jndiName = getLocalJNDIName(remoteClass); target = ic.lookup(jndiName);
@@ -146,12 +146,12 @@ public class RemoteSafeInvocationHandler implements ServerInvocationHandler { }
private static <T> String getLocalJNDIName(Class<?> remoteClass) { - return ("java:global/rhq/rhq-enterprise-server-ejb3/" + remoteClass.getSimpleName().replace("Remote", "Bean") + return ("java:global/rhq/rhq-server/" + remoteClass.getSimpleName().replace("Remote", "Bean") + "!" + remoteClass.getName().replace("Remote", "Local")); }
private static <T> String getRemoteJNDIName(Class<?> remoteClass) { - return ("java:global/rhq/rhq-enterprise-server-ejb3/" + remoteClass.getSimpleName().replace("Remote", "Bean") + return ("java:global/rhq/rhq-server/" + remoteClass.getSimpleName().replace("Remote", "Bean") + "!" + remoteClass.getName()); }
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java index 7b60e13..d597363 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java @@ -482,7 +482,7 @@ public final class LookupUtil { public static TopologyManagerLocal getTopologyManager() { return lookupLocal(TopologyManagerBean.class); } - + public static StorageNodeManagerLocal getStorageNodeManager() { return lookupLocal(StorageNodeManagerBean.class); } @@ -636,10 +636,10 @@ public final class LookupUtil {
/** * Generic method to lookup an Ejb bean by name and the interface name - * + * * @param beanName the name of the EJB bean * @param interfaceName the full class name of either the remote or local interface - * + * * @return the bean accessed through specified interface */ public static Object getEjb(String beanName, String interfaceName) { @@ -656,7 +656,7 @@ public final class LookupUtil { // Private Methods
private static String getLocalJNDIName(String beanName, String interfaceName) { - return "java:global/rhq/rhq-enterprise-server-ejb3/" + beanName + "!" + interfaceName; + return "java:global/rhq/rhq-server/" + beanName + "!" + interfaceName; }
private static <T> String getLocalJNDIName(@NotNull @@ -673,7 +673,7 @@ public final class LookupUtil { */ private static <T> String getRemoteJNDIName(@NotNull Class<? extends T> beanClass) { - return ("java:global/rhq/rhq-enterprise-server-ejb3/" + beanClass.getSimpleName() + "!" + beanClass.getName() + return ("java:global/rhq/rhq-server/" + beanClass.getSimpleName() + "!" + beanClass.getName() .replace("Bean", "Remote")); }
diff --git a/modules/enterprise/server/jar/src/main/resources/server-comm-configuration-overrides.properties b/modules/enterprise/server/jar/src/main/resources/server-comm-configuration-overrides.properties index 91ccc85..f529be9 100644 --- a/modules/enterprise/server/jar/src/main/resources/server-comm-configuration-overrides.properties +++ b/modules/enterprise/server/jar/src/main/resources/server-comm-configuration-overrides.properties @@ -1,5 +1,5 @@ # location of the plugin jars and other files agents can download directly from sever -rhq.server.agent-files-directory=${rhq.server.home}/modules/org/rhq/rhq-enterprise-server-startup-subsystem/main/deployments/rhq.ear/rhq-downloads +rhq.server.agent-files-directory=${rhq.server.home}/modules/org/rhq/server-startup/main/deployments/rhq.ear/rhq-downloads # location where data files can be stored rhq.communications.data-directory=${jboss.server.data.dir} # global limit on number of concurrent incoming messages allowed diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java index df07b5a..bb6aa40 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java @@ -354,7 +354,7 @@ public class Install extends AbstractInstall {
private File getAgentInstaller() { File agentDownloadDir = new File(getBaseDir(), - "modules/org/rhq/rhq-enterprise-server-startup-subsystem/main/deployments/rhq.ear/rhq-downloads/rhq-agent"); + "modules/org/rhq/server-startup/main/deployments/rhq.ear/rhq-downloads/rhq-agent"); return agentDownloadDir.listFiles(new FileFilter() { @Override public boolean accept(File file) { diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java index 37667c6..9245baf 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java @@ -571,7 +571,7 @@ public class Upgrade extends AbstractInstall {
private File getFileDownload(String directory, final String fileMatch) { File downloadDir = new File(getBaseDir(), - "modules/org/rhq/rhq-enterprise-server-startup-subsystem/main/deployments/rhq.ear/rhq-downloads/" + "modules/org/rhq/server-startup/main/deployments/rhq.ear/rhq-downloads/" + directory); return downloadDir.listFiles(new FileFilter() { @Override diff --git a/modules/enterprise/server/startup-subsystem/pom.xml b/modules/enterprise/server/startup-subsystem/pom.xml index 3b5b2ba..e69df2e 100644 --- a/modules/enterprise/server/startup-subsystem/pom.xml +++ b/modules/enterprise/server/startup-subsystem/pom.xml @@ -13,7 +13,7 @@ <relativePath>../../../../pom.xml</relativePath> </parent>
- <artifactId>rhq-enterprise-server-startup-subsystem</artifactId> + <artifactId>server-startup</artifactId>
<name>RHQ Server Startup AS7 Subsystem</name>
@@ -106,7 +106,7 @@ <artifactId>jboss-as-ee</artifactId> <scope>provided</scope> </dependency> - + <!-- our startup subsystem will be deploying this --> <dependency> <groupId>org.rhq</groupId> diff --git a/pom.xml b/pom.xml index d52dcc7..26703d1 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ <rhq.defaultDevContainerPath>dev-container</rhq.defaultDevContainerPath> <rhq.devContainerServerPath>${rhq.defaultDevContainerPath}/rhq-server</rhq.devContainerServerPath> <!-- path relative to under dev container path where the EAR is deployed --> - <rhq.earDeployDir>modules/org/rhq/rhq-enterprise-server-startup-subsystem/main/deployments/${rhq.earName}</rhq.earDeployDir> + <rhq.earDeployDir>modules/org/rhq/server-startup/main/deployments/${rhq.earName}</rhq.earDeployDir> <!-- path relative to under dev container path where other things are stored --> <rhq.agentPluginDir>${rhq.earDeployDir}/rhq-downloads/rhq-plugins</rhq.agentPluginDir> <rhq.serverPluginDir>${rhq.earDeployDir}/rhq-serverplugins</rhq.serverPluginDir>