Author: ips Date: 2008-12-09 16:06:12 -0500 (Tue, 09 Dec 2008) New Revision: 68 Added: trunk/jbas4/src/ trunk/jbas4/src/main/ trunk/jbas4/src/main/webapp/ trunk/jbas4/src/main/webapp/WEB-INF/ trunk/jbas4/src/main/webapp/WEB-INF/jboss-web.xml trunk/jbas5/src/main/webapp/WEB-INF/ trunk/jbas5/src/main/webapp/WEB-INF/jboss-web.xml Modified: trunk/core/pom.xml trunk/core/src/main/webapp/WEB-INF/jboss-web.xml trunk/jbas4/pom.xml trunk/jbas5/pom.xml trunk/pom.xml Log: specify context-root in jboss-web.xml (https://jira.jboss.org/jira/browse/EMBJOPR-32) Modified: trunk/core/pom.xml =================================================================== --- trunk/core/pom.xml 2008-12-09 05:28:56 UTC (rev 67) +++ trunk/core/pom.xml 2008-12-09 21:06:12 UTC (rev 68) @@ -275,12 +275,6 @@ ${basedir}/src/main/webapp </directory> </resource> - <!-- Enabling this will include any plugins in the main/plugins/plugins directory to be included - in the WAR. - <resource> - <directory>${basedir}/src/main/plugins</directory> - </resource> - --> <resource> <directory> ${basedir}/src/main/webappBinary Modified: trunk/core/src/main/webapp/WEB-INF/jboss-web.xml =================================================================== --- trunk/core/src/main/webapp/WEB-INF/jboss-web.xml 2008-12-09 05:28:56 UTC (rev 67) +++ trunk/core/src/main/webapp/WEB-INF/jboss-web.xml 2008-12-09 21:06:12 UTC (rev 68) @@ -1,3 +1,7 @@ +<?xml version="1.0"?> + +<!DOCTYPE jboss-web> + <!-- ~ Embedded Jopr Project ~ Copyright (C) 2006-2008 Red Hat, Inc. @@ -26,4 +30,4 @@ </class-loading> <security-domain>java:/jaas/jmx-console</security-domain> -</jboss-web> \ No newline at end of file +</jboss-web> Modified: trunk/jbas4/pom.xml =================================================================== --- trunk/jbas4/pom.xml 2008-12-09 05:28:56 UTC (rev 67) +++ trunk/jbas4/pom.xml 2008-12-09 21:06:12 UTC (rev 68) @@ -29,6 +29,7 @@ <jopr-embedded-core.version>1.1.0-SNAPSHOT</jopr-embedded-core.version> <warDir>${basedir}/target/${project.build.finalName}</warDir> <warFile>${warDir}.war</warFile> + <contextRoot>admin-console</contextRoot> </properties> <dependencies> @@ -94,21 +95,23 @@ <plugin> <artifactId>maven-war-plugin</artifactId> <configuration> - <useCache>false</useCache> - <archive> - <manifest> - <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - </archive> + <webResources> + <resource> + <filtering>true</filtering> + <directory> + ${basedir}/src/main/webapp + </directory> + </resource> + </webResources> <overlays> <overlay> + <!-- empty groupId/artifactId detected as the current build. + earlier overlays win over later overlays, so put ourselves first. --> + </overlay> + <overlay> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-core</artifactId> </overlay> - <overlay> - <!-- empty groupId/artifactId detected as the current build --> - </overlay> </overlays> </configuration> </plugin> Added: trunk/jbas4/src/main/webapp/WEB-INF/jboss-web.xml =================================================================== --- trunk/jbas4/src/main/webapp/WEB-INF/jboss-web.xml (rev 0) +++ trunk/jbas4/src/main/webapp/WEB-INF/jboss-web.xml 2008-12-09 21:06:12 UTC (rev 68) @@ -0,0 +1,35 @@ +<?xml version="1.0"?> + +<!DOCTYPE jboss-web> + +<!-- + ~ Embedded Jopr Project + ~ Copyright (C) 2006-2008 Red Hat, Inc. + ~ All rights reserved. + ~ + ~ This program is free software; you can redistribute it and/or modify + ~ it under the terms of the GNU Lesser General Public License as + ~ published by the Free Software Foundation; either version 2.1 of + ~ the License, or (at your option) any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public + ~ License along with this program; if not, write to the Free Software + ~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + --> +<jboss-web> + <context-root>${contextRoot}</context-root> + + <class-loading> + <loader-repository> + org.jboss.on:loader=embedded + <loader-repository-config>java2ParentDelegation=false</loader-repository-config> + </loader-repository> + </class-loading> + + <security-domain>java:/jaas/jmx-console</security-domain> +</jboss-web> Property changes on: trunk/jbas4/src/main/webapp/WEB-INF/jboss-web.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:keywords + Date Author Id Revision HeadURL Name: svn:eol-style + LF Modified: trunk/jbas5/pom.xml =================================================================== --- trunk/jbas5/pom.xml 2008-12-09 05:28:56 UTC (rev 67) +++ trunk/jbas5/pom.xml 2008-12-09 21:06:12 UTC (rev 68) @@ -29,6 +29,7 @@ <jopr-embedded-core.version>1.1.0-SNAPSHOT</jopr-embedded-core.version> <warDir>${basedir}/target/${project.build.finalName}</warDir> <warFile>${warDir}.war</warFile> + <contextRoot>admin-console</contextRoot> </properties> <dependencies> @@ -72,21 +73,23 @@ <plugin> <artifactId>maven-war-plugin</artifactId> <configuration> - <useCache>false</useCache> - <archive> - <manifest> - <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - </archive> + <webResources> + <resource> + <filtering>true</filtering> + <directory> + ${basedir}/src/main/webapp + </directory> + </resource> + </webResources> <overlays> <overlay> + <!-- empty groupId/artifactId detected as the current build. + earlier overlays win over later overlays, so put ourselves first. --> + </overlay> + <overlay> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-core</artifactId> </overlay> - <overlay> - <!-- empty groupId/artifactId detected as the current build --> - </overlay> </overlays> </configuration> </plugin> Added: trunk/jbas5/src/main/webapp/WEB-INF/jboss-web.xml =================================================================== --- trunk/jbas5/src/main/webapp/WEB-INF/jboss-web.xml (rev 0) +++ trunk/jbas5/src/main/webapp/WEB-INF/jboss-web.xml 2008-12-09 21:06:12 UTC (rev 68) @@ -0,0 +1,35 @@ +<?xml version="1.0"?> + +<!DOCTYPE jboss-web> + +<!-- + ~ Embedded Jopr Project + ~ Copyright (C) 2006-2008 Red Hat, Inc. + ~ All rights reserved. + ~ + ~ This program is free software; you can redistribute it and/or modify + ~ it under the terms of the GNU Lesser General Public License as + ~ published by the Free Software Foundation; either version 2.1 of + ~ the License, or (at your option) any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public + ~ License along with this program; if not, write to the Free Software + ~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + --> +<jboss-web> + <context-root>${contextRoot}</context-root> + + <class-loading> + <loader-repository> + org.jboss.on:loader=embedded + <loader-repository-config>java2ParentDelegation=false</loader-repository-config> + </loader-repository> + </class-loading> + + <security-domain>java:/jaas/jmx-console</security-domain> +</jboss-web> Property changes on: trunk/jbas5/src/main/webapp/WEB-INF/jboss-web.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:keywords + Date Author Id Revision HeadURL Name: svn:eol-style + LF Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2008-12-09 05:28:56 UTC (rev 67) +++ trunk/pom.xml 2008-12-09 21:06:12 UTC (rev 68) @@ -52,8 +52,8 @@ </issueManagement> <properties> - <jbas4.finalName>admin-console</jbas4.finalName> - <jbas5.finalName>admin-console</jbas5.finalName> + <jbas4.finalName>jbas4-admin-console</jbas4.finalName> + <jbas5.finalName>jbas5-admin-console</jbas5.finalName> <!-- dependency groupIds --> <rhq.groupId>org.rhq</rhq.groupId> @@ -82,7 +82,8 @@ <artifactId>maven-war-plugin</artifactId> <configuration> <useCache>false</useCache> - <archive> + + <archive> <manifest> <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> <addDefaultImplementationEntries>true</addDefaultImplementationEntries> @@ -92,7 +93,7 @@ at the time the buildNumber prop below is resolved. --> <Build-Number>${buildNumber}</Build-Number> </manifestEntries> - </archive> + </archive> </configuration> </plugin>