8:18 a.m.
Author: hfnukal
Date: 2011-05-30 02:18:42 -0400 (Mon, 30 May 2011)
New Revision: 6572
Modified:
epp/portal/branches/EPP-5-1-tmp/distribution/pom.xml
epp/portal/branches/EPP-5-1-tmp/distribution/portletbridge/
epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/
epp/portal/branches/EPP-5-1-tmp/distribution/src/assemble.xml
epp/portal/branches/EPP-5-1-tmp/settings.xml
Log:
Renaming root folder
Modified: epp/portal/branches/EPP-5-1-tmp/distribution/pom.xml
===================================================================
--- epp/portal/branches/EPP-5-1-tmp/distribution/pom.xml 2011-05-27 04:40:37 UTC (rev
6571)
+++ epp/portal/branches/EPP-5-1-tmp/distribution/pom.xml 2011-05-30 06:18:42 UTC (rev
6572)
@@ -57,13 +57,13 @@
<version>5.1.1-epp-CR01-SNAPSHOT</version>
<type>war</type>
</dependency>
-<dependency>
- <groupId>org.exoplatform.portal.distribution</groupId>
- <artifactId>portletbridge</artifactId>
+ <dependency>
+ <groupId>org.exoplatform.portal.distribution</groupId>
+ <artifactId>portletbridge</artifactId>
<version>5.1.1-epp-CR01-SNAPSHOT</version>
- <classifier>bin</classifier>
- <type>zip</type>
-</dependency>
+ <classifier>bin</classifier>
+ <type>zip</type>
+ </dependency>
<!-- EAP overlay -->
<dependency>
@@ -75,6 +75,7 @@
</dependencies>
<build>
+ <finalName>EPP-${version}</finalName>
<plugins>
<!-- <plugin>
@@ -118,7 +119,7 @@
<executions>
<execution>
<id>distro-assembly</id>
- <phase>package</phase>
+ <phase>compile</phase>
<goals>
<goal>single</goal>
</goals>
@@ -130,21 +131,24 @@
</execution>
</executions>
</plugin>
- <plugin>
+<!-- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<id>ant-final</id>
- <phase>package</phase>
+ <phase>compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
<configuration>
<target>
- <move file="${eap.dir}"
toFile="${epp.dir}"/>
+ <move
file="${project.build.directory}/${project.build.finalName}-bin/${eap.dir}"
toFile="${project.build.directory}/${project.build.finalName}-bin/${epp.dir}"/>
</target>
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin>-->
</plugins>
</build>
</project>
\ No newline at end of file
Property changes on: epp/portal/branches/EPP-5-1-tmp/distribution/portletbridge
___________________________________________________________________
Added: svn:ignore
+ target
Property changes on: epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon
___________________________________________________________________
Added: svn:ignore
+ target
Modified: epp/portal/branches/EPP-5-1-tmp/distribution/src/assemble.xml
===================================================================
--- epp/portal/branches/EPP-5-1-tmp/distribution/src/assemble.xml 2011-05-27 04:40:37 UTC
(rev 6571)
+++ epp/portal/branches/EPP-5-1-tmp/distribution/src/assemble.xml 2011-05-30 06:18:42 UTC
(rev 6572)
@@ -5,6 +5,7 @@
<id>bin</id>
<formats>
<format>dir</format>
+ <format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<!-- <useProjectArtifact>false</useProjectArtifact>-->
@@ -23,6 +24,10 @@
<source>../component/common/src/main/java/conf/configuration.xml</source>
<outputDirectory>${eap.dir}/jboss-as/server/default/conf/gatein</outputDirectory>
</file>
+<!-- <file>
+ <source>src/main/run.sh</source>
+ <outputDirectory>${eap.dir}/jboss-as/bin/</outputDirectory>
+ </file>-->
</files>
<dependencySets>
<dependencySet>
@@ -57,10 +62,17 @@
<outputDirectory>${eap.dir}/${artifact.artifactId}</outputDirectory>
<unpack>true</unpack>
</dependencySet>
+ <dependencySet>
+ <includes>
+ <include>*.deploy:*:zip</include>
+ </includes>
+
<outputDirectory>${eap.dir}/server/default/deploy/</outputDirectory>
+ <unpack>true</unpack>
+ </dependencySet>
<dependencySet>
<includes>
- <include>*:zip</include>
+ <include>org.jboss:jboss-eap:zip</include>
</includes>
<outputDirectory></outputDirectory>
<unpack>true</unpack>
Modified: epp/portal/branches/EPP-5-1-tmp/settings.xml
===================================================================
--- epp/portal/branches/EPP-5-1-tmp/settings.xml 2011-05-27 04:40:37 UTC (rev 6571)
+++ epp/portal/branches/EPP-5-1-tmp/settings.xml 2011-05-30 06:18:42 UTC (rev 6572)
@@ -1,14 +1,27 @@
<?xml version="1.0"?>
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
http://maven.apache.org/xsd/settings-1.0.0.xsd">
- <localRepository>${env.HOME}/.m2_EPP</localRepository>
-
- <mirrors>
- <mirror>
- <id>internal-repository</id>
- <name>Maven Repository Manager running on repo.mycompany.com</name>
-
<url>http://download.devel.redhat.com/brewroot/repos/jboss-epp-5-build/...
- <mirrorOf>*</mirrorOf>
- </mirror>
- </mirrors>
+ <localRepository>${env.HOME}/.m2_EPP</localRepository>
+ <profiles>
+ <profile>
+ <id>local</id>
+ <repositories>
+ <repository>
+ <id>gatein-local</id>
+ <url>~/m2EPPexo</url>
+ </repository>
+ </repositories>
+ </profile>
+ </profiles>
+
<activeProfiles><activeProfile>local</activeProfile></activeProfiles>
+<!--
+ <mirrors>
+ <mirror>
+ <id>internal-repository</id>
+ <name>Maven Repository Manager running on
repo.mycompany.com</name>
+
<url>http://download.devel.redhat.com/brewroot/repos/jboss-epp-5-build/...
+ <mirrorOf>*</mirrorOf>
+ </mirror>
+ </mirrors>-->
+
</settings>