[embjopr-commits] EMBJOPR SVN: r944 - in branches/EmbJopr_1_3: core and 2 other directories.
embjopr-commits at lists.jboss.org
embjopr-commits at lists.jboss.org
Thu May 27 11:48:51 EDT 2010
Author: ips
Date: 2010-05-27 11:48:50 -0400 (Thu, 27 May 2010)
New Revision: 944
Modified:
branches/EmbJopr_1_3/core/pom.xml
branches/EmbJopr_1_3/jbas4/pom.xml
branches/EmbJopr_1_3/jbas5/pom.xml
branches/EmbJopr_1_3/pom.xml
Log:
[maven-release-plugin] prepare release EmbJopr_1_3_4_CR1
Modified: branches/EmbJopr_1_3/core/pom.xml
===================================================================
--- branches/EmbJopr_1_3/core/pom.xml 2010-05-26 16:15:21 UTC (rev 943)
+++ branches/EmbJopr_1_3/core/pom.xml 2010-05-27 15:48:50 UTC (rev 944)
@@ -1,423 +1,424 @@
-<!--
- ~ Embedded Jopr Project
- ~ Copyright (C) 2006-2010 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.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.jboss.jopr</groupId>
- <artifactId>jopr-embedded-parent</artifactId>
- <version>1.3.4-SNAPSHOT</version>
- </parent>
-
- <groupId>org.jboss.jopr</groupId>
- <artifactId>jopr-embedded-core</artifactId>
- <packaging>war</packaging>
- <name>Embedded Jopr Core</name>
- <description>a web application that provides administration and monitoring of the app server instance to which it is
- deployed
- </description>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/branches/EmbJopr_1_3_2_GA_CP/core/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/branches/EmbJopr_1_3_2_GA_CP/core/</developerConnection>
- </scm>
-
- <properties>
- <war.dir>${basedir}/target/${project.build.finalName}</war.dir>
- <product.name>Embedded Jopr</product.name>
- <product.version>${project.version}</product.version>
- </properties>
-
- <dependencies>
- <!-- == RHQ Core Dependencies ================ -->
- <dependency>
- <groupId>${rhq.groupId}</groupId>
- <artifactId>rhq-core-client-api</artifactId>
- <version>${rhq.version}</version>
- </dependency>
- <dependency>
- <groupId>${rhq.groupId}</groupId>
- <artifactId>rhq-core-domain</artifactId>
- <version>${rhq.version}</version>
- </dependency>
- <dependency>
- <groupId>${rhq.groupId}</groupId>
- <artifactId>rhq-core-gui</artifactId>
- <version>${rhq.version}</version>
- </dependency>
- <dependency>
- <groupId>${rhq.groupId}</groupId>
- <artifactId>rhq-core-plugin-container</artifactId>
- <version>${rhq.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.hyperic</groupId>
- <artifactId>sigar</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>${rhq.groupId}</groupId>
- <artifactId>rhq-core-util</artifactId>
- <version>${rhq.version}</version>
- </dependency>
-
- <!-- == Seam Related Dependencies ================ -->
- <dependency>
- <groupId>${seam.groupId}</groupId>
- <artifactId>jboss-seam</artifactId>
- <version>${seam.version}</version>
- <exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>${seam.groupId}</groupId>
- <artifactId>jboss-seam-ui</artifactId>
- <version>${seam.version}</version>
- </dependency>
- <!-- third party dependencies needed when running tests with Seam -->
- <dependency>
- <groupId>${seam.embedded.groupId}</groupId>
- <artifactId>jboss-embedded-all</artifactId>
- <version>${seam.embedded.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${seam.embedded.groupId}</groupId>
- <artifactId>thirdparty-all</artifactId>
- <version>${seam.embedded.version}</version>
- <scope>test</scope>
- </dependency>
- <!-- needed because the version of javassist pulled in by Seam (3.3.GA)
- isn't compatible with the current version of jboss embedded (beta3) -->
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.5.0.GA</version>
- <scope>test</scope>
- </dependency>
- <!--
- these next two jars need to be a compile time dependency in order
- to include the annotations used by the domain classes, but are not needed at runtime.
- Without these in the classpath you get exceptions like this from javac:
- com.sun.tools.javac.code.Symbol$CompletionFailure: file org\hibernate\annotations\Cascade.class not found
-
- IIRC this is fixed in jdk6. -->
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <version>3.3.0.ga</version>
- <scope>provided</scope>
- </dependency>
- <!-- don't know why this is required if you dont have it you get:
- file org\hibernate\validator\InvalidValue.class not found
- facesMessages.add(new FacesMessage(FacesMessage.SEVERITY_ERROR, errorMessage, null));
- -->
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- <version>3.0.0.ga</version>
- <scope>provided</scope>
- <!-- (not required at runtime) -->
- </dependency>
- <!-- TODO: remove this before we release -->
- <dependency>
- <groupId>${seam.groupId}</groupId>
- <artifactId>jboss-seam-debug</artifactId>
- <version>${seam.version}</version>
- <!-- should be pulling this in directly ourselves, not relying
- jboss-seam-debug to provide it -->
- <exclusions>
- <exclusion>
- <groupId>com.sun.facelets</groupId>
- <artifactId>jsf-facelets</artifactId>
- </exclusion>
- </exclusions>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>1.2_10</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Provided in 5.0 -->
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.facelets</groupId>
- <artifactId>jsf-facelets</artifactId>
- <version>${facelets.version}</version>
- <scope>runtime</scope>
- </dependency>
-
- <!-- ===== RichFaces ===== -->
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-api</artifactId>
- <version>${richfaces.version}</version>
- </dependency>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>${richfaces.version}</version>
- </dependency>
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui</artifactId>
- <version>${richfaces.version}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>apache-discovery</groupId>
- <artifactId>commons-discovery</artifactId>
- <version>0.4-brew</version>
- </dependency>
-
- <!-- == 3rd Party Provided Dependencies ================ -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- <!-- by JBossAS -->
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- <!-- by JBossAS -->
- </dependency>
- <!-- Provided in 5.0 -->
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${jaxb-api.version}</version>
- <scope>provided</scope>
- </dependency>
- <!-- Provided in 5.0 -->
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb-impl.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
-
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.0</version>
- <executions>
- <execution>
- <id>copy-dist-plugins</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <outputDirectory>${war.dir}/plugins</outputDirectory>
- <artifactItems>
- <artifactItem>
- <groupId>
- ${rhq.groupId}
- </groupId>
- <artifactId>
- rhq-platform-plugin
- </artifactId>
- <version>
- ${rhq.version}
- </version>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <useCache>false</useCache>
- <webResources>
- <resource>
- <filtering>true</filtering>
- <directory>
- ${basedir}/src/main/webapp
- </directory>
- </resource>
- <resource>
- <directory>
- ${basedir}/src/main/webappBinary
- </directory>
- </resource>
- </webResources>
- <archiveClasses>true</archiveClasses>
- <attachClasses>true</attachClasses>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- <manifestEntries>
- <!-- TODO: This isn't working, because the build number plugin hasn't run yet
- at the time the buildNumber prop below is resolved. -->
- <Build-Number>${buildNumber}</Build-Number>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>-Djava.library.path=target/itest/lib</argLine>
- <trimStackTrace>false</trimStackTrace>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
- <repositories>
- <!-- If the JBoss repo is down, uncomment this to pull down the JSF jars. -->
- <!--
- <repository>
- <id>java.net</id>
- <name>java.net Maven 1 Repository</name>
- <url>https://maven-repository.dev.java.net/repository/</url>
- <layout>legacy</layout>
- </repository>
- -->
- </repositories>
-
- <profiles>
- <profile>
- <id>dev</id>
-
- <properties>
- <jbas4.warDir>${jbas4.configDir}/deploy/${jbas4.finalName}.war</jbas4.warDir>
- <jbas5.warDir>${jbas5.configDir}/deploy/${jbas5.finalName}.war</jbas5.warDir>
- </properties>
-
- <build>
- <plugins>
-
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <executions>
-
- <execution>
- <id>deploy-to-jbas4</id>
- <phase>compile</phase>
- <configuration>
- <tasks>
- <echo>*** Copying updated files from target${file.separator}classes to <jbas4.warDir>${file.separator}WEB-INF${file.separator}classes...</echo>
- <copy todir="${jbas4.warDir}/WEB-INF/classes">
- <fileset dir="target/classes" />
- </copy>
-
- <echo>*** Copying updated files from
- src${file.separator}main${file.separator}webapp${file.separator} and
- src${file.separator}main${file.separator}webappBinary${file.separator} to
- <jbas4.warDir>...
- </echo>
- <copy todir="${jbas4.warDir}">
- <fileset dir="${basedir}/src/main/webapp" />
- <fileset dir="${basedir}/src/main/webappBinary" />
- </copy>
- <!-- TODO: Also copy the files from src/main/webapp-filtered/, and then filter them ourselves. -->
-
- <echo>*** Touching <jbas4.warDir>/WEB-INF/web.xml to force redeploy...
- </echo>
- <touch file="${jbas4.warDir}/WEB-INF/web.xml" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- <execution>
- <id>deploy-to-jbas5</id>
- <phase>compile</phase>
- <configuration>
- <tasks>
- <echo>*** Copying updated files from target${file.separator}classes to <jbas5.warDir>${file.separator}WEB-INF${file.separator}classes...</echo>
- <copy todir="${jbas5.warDir}/WEB-INF/classes">
- <fileset dir="target/classes" />
- </copy>
-
- <echo>*** Copying updated files from
- src${file.separator}main${file.separator}webapp${file.separator} and
- src${file.separator}main${file.separator}webappBinary${file.separator} to
- <jbas5.warDir>...
- </echo>
- <copy todir="${jbas5.warDir}">
- <fileset dir="${basedir}/src/main/webapp" />
- <fileset dir="${basedir}/src/main/webappBinary" />
- </copy>
- <!-- TODO: Also copy the files from src/main/webapp-filtered/, and then filter them ourselves. -->
-
- <!--
- <echo>*** Touching <jbas5.warDir>/WEB-INF/web.xml to force redeploy...</echo>
- <touch file="${jbas5.warDir}/WEB-INF/web.xml" />
- -->
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- </executions>
- </plugin>
-
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
+<!--
+ ~ Embedded Jopr Project
+ ~ Copyright (C) 2006-2010 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.jboss.jopr</groupId>
+ <artifactId>jopr-embedded-parent</artifactId>
+ <version>1.3.4.CR1</version>
+ </parent>
+
+ <groupId>org.jboss.jopr</groupId>
+ <artifactId>jopr-embedded-core</artifactId>
+ <packaging>war</packaging>
+ <name>Embedded Jopr Core</name>
+ <description>a web application that provides administration and monitoring of the app server instance to which it is
+ deployed
+ </description>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr_1_3_4_CR1</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_3_4_CR1</developerConnection>
+ <url>http://git.fedorahosted.org/git/tags/EmbJopr_1_3_4_CR1/jopr-embedded-core?p=rhq/rhq.git/jopr-embedded-parent/jopr-embedded-core</url>
+ </scm>
+
+ <properties>
+ <war.dir>${basedir}/target/${project.build.finalName}</war.dir>
+ <product.name>Embedded Jopr</product.name>
+ <product.version>${project.version}</product.version>
+ </properties>
+
+ <dependencies>
+ <!-- == RHQ Core Dependencies ================ -->
+ <dependency>
+ <groupId>${rhq.groupId}</groupId>
+ <artifactId>rhq-core-client-api</artifactId>
+ <version>${rhq.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${rhq.groupId}</groupId>
+ <artifactId>rhq-core-domain</artifactId>
+ <version>${rhq.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${rhq.groupId}</groupId>
+ <artifactId>rhq-core-gui</artifactId>
+ <version>${rhq.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${rhq.groupId}</groupId>
+ <artifactId>rhq-core-plugin-container</artifactId>
+ <version>${rhq.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hyperic</groupId>
+ <artifactId>sigar</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${rhq.groupId}</groupId>
+ <artifactId>rhq-core-util</artifactId>
+ <version>${rhq.version}</version>
+ </dependency>
+
+ <!-- == Seam Related Dependencies ================ -->
+ <dependency>
+ <groupId>${seam.groupId}</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <version>${seam.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${seam.groupId}</groupId>
+ <artifactId>jboss-seam-ui</artifactId>
+ <version>${seam.version}</version>
+ </dependency>
+ <!-- third party dependencies needed when running tests with Seam -->
+ <dependency>
+ <groupId>${seam.embedded.groupId}</groupId>
+ <artifactId>jboss-embedded-all</artifactId>
+ <version>${seam.embedded.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${seam.embedded.groupId}</groupId>
+ <artifactId>thirdparty-all</artifactId>
+ <version>${seam.embedded.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- needed because the version of javassist pulled in by Seam (3.3.GA)
+ isn't compatible with the current version of jboss embedded (beta3) -->
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.5.0.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <!--
+ these next two jars need to be a compile time dependency in order
+ to include the annotations used by the domain classes, but are not needed at runtime.
+ Without these in the classpath you get exceptions like this from javac:
+ com.sun.tools.javac.code.Symbol$CompletionFailure: file org\hibernate\annotations\Cascade.class not found
+
+ IIRC this is fixed in jdk6. -->
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <version>3.3.0.ga</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- don't know why this is required if you dont have it you get:
+ file org\hibernate\validator\InvalidValue.class not found
+ facesMessages.add(new FacesMessage(FacesMessage.SEVERITY_ERROR, errorMessage, null));
+ -->
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>3.0.0.ga</version>
+ <scope>provided</scope>
+ <!-- (not required at runtime) -->
+ </dependency>
+ <!-- TODO: remove this before we release -->
+ <dependency>
+ <groupId>${seam.groupId}</groupId>
+ <artifactId>jboss-seam-debug</artifactId>
+ <version>${seam.version}</version>
+ <!-- should be pulling this in directly ourselves, not relying
+ jboss-seam-debug to provide it -->
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ </exclusion>
+ </exclusions>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.2_10</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Provided in 5.0 -->
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ <version>${facelets.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- ===== RichFaces ===== -->
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-api</artifactId>
+ <version>${richfaces.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <version>${richfaces.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui</artifactId>
+ <version>${richfaces.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-discovery</groupId>
+ <artifactId>commons-discovery</artifactId>
+ <version>0.4-brew</version>
+ </dependency>
+
+ <!-- == 3rd Party Provided Dependencies ================ -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ <!-- by JBossAS -->
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ <!-- by JBossAS -->
+ </dependency>
+ <!-- Provided in 5.0 -->
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-api.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- Provided in 5.0 -->
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb-impl.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.0</version>
+ <executions>
+ <execution>
+ <id>copy-dist-plugins</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${war.dir}/plugins</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>
+ ${rhq.groupId}
+ </groupId>
+ <artifactId>
+ rhq-platform-plugin
+ </artifactId>
+ <version>
+ ${rhq.version}
+ </version>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <useCache>false</useCache>
+ <webResources>
+ <resource>
+ <filtering>true</filtering>
+ <directory>
+ ${basedir}/src/main/webapp
+ </directory>
+ </resource>
+ <resource>
+ <directory>
+ ${basedir}/src/main/webappBinary
+ </directory>
+ </resource>
+ </webResources>
+ <archiveClasses>true</archiveClasses>
+ <attachClasses>true</attachClasses>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ <!-- TODO: This isn't working, because the build number plugin hasn't run yet
+ at the time the buildNumber prop below is resolved. -->
+ <Build-Number>${buildNumber}</Build-Number>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-Djava.library.path=target/itest/lib</argLine>
+ <trimStackTrace>false</trimStackTrace>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+
+ <repositories>
+ <!-- If the JBoss repo is down, uncomment this to pull down the JSF jars. -->
+ <!--
+ <repository>
+ <id>java.net</id>
+ <name>java.net Maven 1 Repository</name>
+ <url>https://maven-repository.dev.java.net/repository/</url>
+ <layout>legacy</layout>
+ </repository>
+ -->
+ </repositories>
+
+ <profiles>
+ <profile>
+ <id>dev</id>
+
+ <properties>
+ <jbas4.warDir>${jbas4.configDir}/deploy/${jbas4.finalName}.war</jbas4.warDir>
+ <jbas5.warDir>${jbas5.configDir}/deploy/${jbas5.finalName}.war</jbas5.warDir>
+ </properties>
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+
+ <execution>
+ <id>deploy-to-jbas4</id>
+ <phase>compile</phase>
+ <configuration>
+ <tasks>
+ <echo>*** Copying updated files from target${file.separator}classes to <jbas4.warDir>${file.separator}WEB-INF${file.separator}classes...</echo>
+ <copy todir="${jbas4.warDir}/WEB-INF/classes">
+ <fileset dir="target/classes" />
+ </copy>
+
+ <echo>*** Copying updated files from
+ src${file.separator}main${file.separator}webapp${file.separator} and
+ src${file.separator}main${file.separator}webappBinary${file.separator} to
+ <jbas4.warDir>...
+ </echo>
+ <copy todir="${jbas4.warDir}">
+ <fileset dir="${basedir}/src/main/webapp" />
+ <fileset dir="${basedir}/src/main/webappBinary" />
+ </copy>
+ <!-- TODO: Also copy the files from src/main/webapp-filtered/, and then filter them ourselves. -->
+
+ <echo>*** Touching <jbas4.warDir>/WEB-INF/web.xml to force redeploy...
+ </echo>
+ <touch file="${jbas4.warDir}/WEB-INF/web.xml" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ <execution>
+ <id>deploy-to-jbas5</id>
+ <phase>compile</phase>
+ <configuration>
+ <tasks>
+ <echo>*** Copying updated files from target${file.separator}classes to <jbas5.warDir>${file.separator}WEB-INF${file.separator}classes...</echo>
+ <copy todir="${jbas5.warDir}/WEB-INF/classes">
+ <fileset dir="target/classes" />
+ </copy>
+
+ <echo>*** Copying updated files from
+ src${file.separator}main${file.separator}webapp${file.separator} and
+ src${file.separator}main${file.separator}webappBinary${file.separator} to
+ <jbas5.warDir>...
+ </echo>
+ <copy todir="${jbas5.warDir}">
+ <fileset dir="${basedir}/src/main/webapp" />
+ <fileset dir="${basedir}/src/main/webappBinary" />
+ </copy>
+ <!-- TODO: Also copy the files from src/main/webapp-filtered/, and then filter them ourselves. -->
+
+ <!--
+ <echo>*** Touching <jbas5.warDir>/WEB-INF/web.xml to force redeploy...</echo>
+ <touch file="${jbas5.warDir}/WEB-INF/web.xml" />
+ -->
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
Modified: branches/EmbJopr_1_3/jbas4/pom.xml
===================================================================
--- branches/EmbJopr_1_3/jbas4/pom.xml 2010-05-26 16:15:21 UTC (rev 943)
+++ branches/EmbJopr_1_3/jbas4/pom.xml 2010-05-27 15:48:50 UTC (rev 944)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.jopr</groupId>
<artifactId>jopr-embedded-parent</artifactId>
- <version>1.3.4-SNAPSHOT</version>
+ <version>1.3.4.CR1</version>
</parent>
<groupId>org.jboss.jopr</groupId>
@@ -14,9 +14,10 @@
<name>JBossAS 4.x Administration Console</name>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/branches/EmbJopr_1_3_2_GA_CP/jbas4/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/branches/EmbJopr_1_3_2_GA_CP/jbas4/</developerConnection>
- </scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr_1_3_4_CR1</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_3_4_CR1</developerConnection>
+ <url>http://git.fedorahosted.org/git/tags/EmbJopr_1_3_4_CR1/jopr-embedded-jbas4?p=rhq/rhq.git/jopr-embedded-parent/jopr-embedded-jbas4</url>
+ </scm>
<properties>
<warDir>${basedir}/target/${project.build.finalName}</warDir>
Modified: branches/EmbJopr_1_3/jbas5/pom.xml
===================================================================
--- branches/EmbJopr_1_3/jbas5/pom.xml 2010-05-26 16:15:21 UTC (rev 943)
+++ branches/EmbJopr_1_3/jbas5/pom.xml 2010-05-27 15:48:50 UTC (rev 944)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.jopr</groupId>
<artifactId>jopr-embedded-parent</artifactId>
- <version>1.3.4-SNAPSHOT</version>
+ <version>1.3.4.CR1</version>
</parent>
<groupId>org.jboss.jopr</groupId>
@@ -14,9 +14,10 @@
<name>JBoss AS/EAP 5.x Administration Console</name>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/branches/EmbJopr_1_3/jbas5/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/branches/EmbJopr_1_3/jbas5/</developerConnection>
- </scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr_1_3_4_CR1/jbas5</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_3_4_CR1/jbas5</developerConnection>
+ <url>http://git.fedorahosted.org/git/tags/EmbJopr_1_3_4_CR1/jopr-embedded-jbas5?p=rhq/rhq.git/jopr-embedded-parent/jopr-embedded-jbas5</url>
+ </scm>
<properties>
<warDir>${basedir}/target/${project.build.finalName}</warDir>
Modified: branches/EmbJopr_1_3/pom.xml
===================================================================
--- branches/EmbJopr_1_3/pom.xml 2010-05-26 16:15:21 UTC (rev 943)
+++ branches/EmbJopr_1_3/pom.xml 2010-05-27 15:48:50 UTC (rev 944)
@@ -17,9 +17,7 @@
~ License along with this program; if not, write to the Free Software
~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -33,7 +31,7 @@
<groupId>org.jboss.jopr</groupId>
<artifactId>jopr-embedded-parent</artifactId>
- <version>1.3.4-SNAPSHOT</version>
+ <version>1.3.4.CR1</version>
<packaging>pom</packaging>
<name>Embedded Jopr</name>
<description>a web application that provides administration and monitoring of the app server instance to which it is deployed</description>
@@ -45,9 +43,10 @@
</organization>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/branches/EmbJopr_1_3/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/branches/EmbJopr_1_3/</developerConnection>
- </scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr_1_3_4_CR1</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_3_4_CR1</developerConnection>
+ <url>http://git.fedorahosted.org/git/tags/EmbJopr_1_3_4_CR1?p=rhq/rhq.git/jopr-embedded-parent</url>
+ </scm>
<issueManagement>
<system>jira</system>
More information about the embjopr-commits
mailing list