You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by im...@apache.org on 2007/08/19 20:14:07 UTC
svn commit: r567447 - in /myfaces/orchestra/trunk: core/pom.xml
core15/pom.xml examples/pom.xml pom.xml
Author: imario
Date: Sun Aug 19 11:14:06 2007
New Revision: 567447
URL: http://svn.apache.org/viewvc?view=rev&rev=567447
Log:
ORCHESTRA-4: I have no clue, just committed the path. Test and jetty still pass.
Modified:
myfaces/orchestra/trunk/core/pom.xml
myfaces/orchestra/trunk/core15/pom.xml
myfaces/orchestra/trunk/examples/pom.xml
myfaces/orchestra/trunk/pom.xml
Modified: myfaces/orchestra/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/pom.xml?view=diff&rev=567447&r1=567446&r2=567447
==============================================================================
--- myfaces/orchestra/trunk/core/pom.xml (original)
+++ myfaces/orchestra/trunk/core/pom.xml Sun Aug 19 11:14:06 2007
@@ -88,12 +88,6 @@
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
-
<plugins>
<plugin>
@@ -110,23 +104,7 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>dependency-maven-plugin</artifactId>
<executions>
- <execution>
- <id>unpack-shared-orchestra</id>
- <phase>process-classes</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.myfaces.shared</groupId>
- <artifactId>myfaces-shared-orchestra</artifactId>
- <version>${myfaces-shared.version}</version>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/classes</outputDirectory>
- </configuration>
- </execution>
+
<!-- unpack the shared sources into target/shared_sources-->
<execution>
<id>unpack-shared-impl-sources</id>
Modified: myfaces/orchestra/trunk/core15/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/pom.xml?view=diff&rev=567447&r1=567446&r2=567447
==============================================================================
--- myfaces/orchestra/trunk/core15/pom.xml (original)
+++ myfaces/orchestra/trunk/core15/pom.xml Sun Aug 19 11:14:06 2007
@@ -20,34 +20,13 @@
<url>http://svn.apache.org/viewcvs.cgi/myfaces/orchestra/trunk/core</url>
</scm>
- <repositories>
- <repository>
- <id>central</id>
- <url>http://www.ibiblio.org/maven2</url>
- </repository>
- <repository>
- <id>java-net</id>
- <url>https://maven-repository.dev.java.net/nonav/repository</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
-
<dependencies>
<!-- compile dependencies -->
-
<dependency>
<groupId>org.apache.myfaces.orchestra</groupId>
<artifactId>myfaces-orchestra-core</artifactId>
- <version>1.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
<scope>compile</scope>
</dependency>
@@ -81,12 +60,7 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.myfaces.shared</groupId>
- <artifactId>myfaces-shared-orchestra</artifactId>
- <scope>provided</scope>
- <!-- because we add all classes to the jar directly -->
- </dependency>
+
<dependency>
<groupId>javax.servlet</groupId>
@@ -96,13 +70,6 @@
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
- </dependency>
-
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
@@ -143,12 +110,6 @@
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
-
<plugins>
<plugin>
@@ -161,68 +122,7 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>dependency-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack-shared-orchestra</id>
- <phase>process-classes</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.myfaces.shared</groupId>
- <artifactId>myfaces-shared-orchestra</artifactId>
- <version>${myfaces-shared.version}</version>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/classes</outputDirectory>
- </configuration>
- </execution>
- <!-- unpack the shared sources into target/shared_sources-->
- <execution>
- <id>unpack-shared-impl-sources</id>
- <phase>process-sources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.myfaces.shared</groupId>
- <artifactId>myfaces-shared-orchestra</artifactId>
- <version>${myfaces-shared.version}</version>
- <classifier>sources</classifier>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/shared_sources</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- the following will add the unpacked shared sources directory as source directory into the pom,
- so also the shared sources are automaticaly included by the attach source plugin -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>process-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.build.directory}/shared_sources</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
+
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
Modified: myfaces/orchestra/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/pom.xml?view=diff&rev=567447&r1=567446&r2=567447
==============================================================================
--- myfaces/orchestra/trunk/examples/pom.xml (original)
+++ myfaces/orchestra/trunk/examples/pom.xml Sun Aug 19 11:14:06 2007
@@ -20,18 +20,6 @@
<url>http://svn.apache.org/viewcvs.cgi/myfaces/orchestra/trunk/examples</url>
</scm>
- <repositories>
- <repository>
- <id>central</id>
- <url>http://www.ibiblio.org/maven2</url>
- </repository>
- <repository>
- <id>java-net</id>
- <url>https://maven-repository.dev.java.net/nonav/repository</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
-
<pluginRepositories>
<pluginRepository>
<id>mortbay-repo</id>
@@ -44,12 +32,10 @@
<dependency>
<groupId>org.apache.myfaces.orchestra</groupId>
<artifactId>myfaces-orchestra-core</artifactId>
- <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.myfaces.orchestra</groupId>
<artifactId>myfaces-orchestra-core15</artifactId>
- <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
Modified: myfaces/orchestra/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/pom.xml?view=diff&rev=567447&r1=567446&r2=567447
==============================================================================
--- myfaces/orchestra/trunk/pom.xml (original)
+++ myfaces/orchestra/trunk/pom.xml Sun Aug 19 11:14:06 2007
@@ -31,6 +31,19 @@
<dependencyManagement>
<dependencies>
+
+ <dependency>
+ <groupId>org.apache.myfaces.orchestra</groupId>
+ <artifactId>myfaces-orchestra-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.orchestra</groupId>
+ <artifactId>myfaces-orchestra-core15</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
@@ -83,6 +96,13 @@
<enabled>false</enabled>
</snapshots>
</repository>
+
+ <repository>
+ <id>java-net</id>
+ <url>http://download.java.net/maven/2</url>
+ <layout>legacy</layout>
+ </repository>
+
</repositories>
<modules>