You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2009/03/11 17:09:33 UTC
svn commit: r752488 - in
/servicemix/smx4/kernel/branches/kernel-1.1.x/demos/smx4web: pom.xml
src/main/java/org/apache/servicemix/smx4webex/WebAppListener.java
Author: gnodet
Date: Wed Mar 11 16:09:33 2009
New Revision: 752488
URL: http://svn.apache.org/viewvc?rev=752488&view=rev
Log:
SMX4KNL-135: Kernel 1.1.0 release canidate has 1.1.0-SNAPSHOT dependency in smx4web demo
Modified:
servicemix/smx4/kernel/branches/kernel-1.1.x/demos/smx4web/pom.xml
servicemix/smx4/kernel/branches/kernel-1.1.x/demos/smx4web/src/main/java/org/apache/servicemix/smx4webex/WebAppListener.java
Modified: servicemix/smx4/kernel/branches/kernel-1.1.x/demos/smx4web/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/branches/kernel-1.1.x/demos/smx4web/pom.xml?rev=752488&r1=752487&r2=752488&view=diff
==============================================================================
--- servicemix/smx4/kernel/branches/kernel-1.1.x/demos/smx4web/pom.xml (original)
+++ servicemix/smx4/kernel/branches/kernel-1.1.x/demos/smx4web/pom.xml Wed Mar 11 16:09:33 2009
@@ -34,7 +34,6 @@
<properties>
<jetty.port>8080</jetty.port>
<jetty.version>6.1.12rc1</jetty.version>
- <servicemix.kernel.version>1.1.0-SNAPSHOT</servicemix.kernel.version>
<geronimo.servlet.version>1.1.2</geronimo.servlet.version>
</properties>
@@ -246,14 +245,36 @@
<groupId>org.apache.servicemix.kernel</groupId>
<artifactId>apache-servicemix-kernel</artifactId>
<type>zip</type>
+ <overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/kernel/WEB-INF</outputDirectory>
- <excludes>**/lib/*,**/*.txt,**/bin/*,**/lib,**/bin</excludes>
+ <excludes>**/lib/*,**/*.txt,**/bin/*,**/demos/**,**/lib,**/bin,**/demos</excludes>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <id>copy-kernel</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <move todir="${project.build.directory}/kernel/WEB-INF/servicemix">
+ <fileset dir="${project.build.directory}/kernel/WEB-INF/apache-servicemix-kernel-${pom.version}"/>
+ </move>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: servicemix/smx4/kernel/branches/kernel-1.1.x/demos/smx4web/src/main/java/org/apache/servicemix/smx4webex/WebAppListener.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/branches/kernel-1.1.x/demos/smx4web/src/main/java/org/apache/servicemix/smx4webex/WebAppListener.java?rev=752488&r1=752487&r2=752488&view=diff
==============================================================================
--- servicemix/smx4/kernel/branches/kernel-1.1.x/demos/smx4web/src/main/java/org/apache/servicemix/smx4webex/WebAppListener.java (original)
+++ servicemix/smx4/kernel/branches/kernel-1.1.x/demos/smx4web/src/main/java/org/apache/servicemix/smx4webex/WebAppListener.java Wed Mar 11 16:09:33 2009
@@ -30,7 +30,7 @@
public void contextInitialized(ServletContextEvent sce) {
try {
System.err.println("contextInitialized");
- String root = new File(sce.getServletContext().getRealPath("/") + "WEB-INF/apache-servicemix-kernel-1.1.0-SNAPSHOT").getAbsolutePath();
+ String root = new File(sce.getServletContext().getRealPath("/") + "WEB-INF/servicemix").getAbsolutePath();
System.err.println("Root: " + root);
System.setProperty("servicemix.home", root);
System.setProperty("servicemix.base", root);