You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by cc...@apache.org on 2009/01/20 08:24:56 UTC

svn commit: r735950 - in /servicemix/smx4/kernel/trunk: ./ assembly/src/main/descriptors/ demos/ demos/smx4web/ demos/smx4web/src/ demos/smx4web/src/main/ demos/smx4web/src/main/java/ demos/smx4web/src/main/java/org/ demos/smx4web/src/main/java/org/apa...

Author: ccustine
Date: Mon Jan 19 23:24:55 2009
New Revision: 735950

URL: http://svn.apache.org/viewvc?rev=735950&view=rev
Log:
SMX4KNL-166 Move the embedded smx demo into trunk

Added:
    servicemix/smx4/kernel/trunk/demos/
    servicemix/smx4/kernel/trunk/demos/pom.xml
    servicemix/smx4/kernel/trunk/demos/smx4web/
    servicemix/smx4/kernel/trunk/demos/smx4web/README.txt
    servicemix/smx4/kernel/trunk/demos/smx4web/pom.xml
    servicemix/smx4/kernel/trunk/demos/smx4web/src/
    servicemix/smx4/kernel/trunk/demos/smx4web/src/main/
    servicemix/smx4/kernel/trunk/demos/smx4web/src/main/java/
    servicemix/smx4/kernel/trunk/demos/smx4web/src/main/java/org/
    servicemix/smx4/kernel/trunk/demos/smx4web/src/main/java/org/apache/
    servicemix/smx4/kernel/trunk/demos/smx4web/src/main/java/org/apache/servicemix/
    servicemix/smx4/kernel/trunk/demos/smx4web/src/main/java/org/apache/servicemix/smx4webex/
    servicemix/smx4/kernel/trunk/demos/smx4web/src/main/java/org/apache/servicemix/smx4webex/WebAppListener.java
    servicemix/smx4/kernel/trunk/demos/smx4web/src/main/webapp/
    servicemix/smx4/kernel/trunk/demos/smx4web/src/main/webapp/WEB-INF/
    servicemix/smx4/kernel/trunk/demos/smx4web/src/main/webapp/WEB-INF/web.xml
    servicemix/smx4/kernel/trunk/demos/smx4web/src/main/webapp/index.jsp
Modified:
    servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
    servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
    servicemix/smx4/kernel/trunk/pom.xml

Modified: servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=735950&r1=735949&r2=735950&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml Mon Jan 19 23:24:55 2009
@@ -50,6 +50,16 @@
             <lineEnding>unix</lineEnding>
         </fileSet>
 
+        <!-- Copy over the examples -->
+        <fileSet>
+            <directory>../demos</directory>
+            <outputDirectory>/demos/</outputDirectory>
+            <lineEnding>unix</lineEnding>
+            <excludes>
+                <exclude>**/target/**</exclude>
+            </excludes>
+        </fileSet>
+
         <!-- Copy over files that should not get the line endings converted -->
         <fileSet>
             <directory>src/main/distribution/binary</directory>

Modified: servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=735950&r1=735949&r2=735950&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml Mon Jan 19 23:24:55 2009
@@ -51,6 +51,16 @@
           <lineEnding>dos</lineEnding>
       </fileSet>
 
+        <!-- Copy over the examples -->
+        <fileSet>
+            <directory>../demos</directory>
+            <outputDirectory>/demos/</outputDirectory>
+            <lineEnding>dos</lineEnding>
+            <excludes>
+                <exclude>**/target/**</exclude>
+            </excludes>
+        </fileSet>
+
       <!-- Copy over files that should not get the line endings converted -->
       <fileSet>
           <directory>src/main/distribution/binary</directory>

Added: servicemix/smx4/kernel/trunk/demos/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/demos/pom.xml?rev=735950&view=auto
==============================================================================
--- servicemix/smx4/kernel/trunk/demos/pom.xml (added)
+++ servicemix/smx4/kernel/trunk/demos/pom.xml Mon Jan 19 23:24:55 2009
@@ -0,0 +1,40 @@
+<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">
+
+    <!--
+
+        Licensed to the Apache Software Foundation (ASF) under one or more
+        contributor license agreements.  See the NOTICE file distributed with
+        this work for additional information regarding copyright ownership.
+        The ASF licenses this file to You under the Apache License, Version 2.0
+        (the "License"); you may not use this file except in compliance with
+        the License.  You may obtain a copy of the License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+        Unless required by applicable law or agreed to in writing, software
+        distributed under the License is distributed on an "AS IS" BASIS,
+        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+        See the License for the specific language governing permissions and
+        limitations under the License.
+    -->
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.servicemix.kernel</groupId>
+        <artifactId>kernel</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.servicemix.kernel</groupId>
+    <artifactId>org.apache.servicemix.kernel.demos</artifactId>
+    <packaging>pom</packaging>
+    <version>1.1.0-SNAPSHOT</version>
+    <name>Apache ServiceMix Kernel :: Demos</name>
+
+    <modules>
+        <module>smx4web</module>
+    </modules>
+
+</project>

Added: servicemix/smx4/kernel/trunk/demos/smx4web/README.txt
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/demos/smx4web/README.txt?rev=735950&view=auto
==============================================================================
--- servicemix/smx4/kernel/trunk/demos/smx4web/README.txt (added)
+++ servicemix/smx4/kernel/trunk/demos/smx4web/README.txt Mon Jan 19 23:24:55 2009
@@ -0,0 +1,28 @@
+################################################################################
+#
+#    Licensed to the Apache Software Foundation (ASF) under one or more
+#    contributor license agreements.  See the NOTICE file distributed with
+#    this work for additional information regarding copyright ownership.
+#    The ASF licenses this file to You under the Apache License, Version 2.0
+#    (the "License"); you may not use this file except in compliance with
+#    the License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+################################################################################
+
+This is an example showing how to embed ServiceMix Kernel in a web application.
+You can either:
+  * build the web app using "mvn package" and deploy the web application to your favorite web container
+  * run the web app from the command line using the "mvn package jetty:run" command
+  
+Once the web application is started, you can use the Apache ServiceMix Kernel client to connect to the running server:
+  cd [smx-kernel-install-dir]
+  java -jar lib/servicemix-client.jar
+  

Added: servicemix/smx4/kernel/trunk/demos/smx4web/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/demos/smx4web/pom.xml?rev=735950&view=auto
==============================================================================
--- servicemix/smx4/kernel/trunk/demos/smx4web/pom.xml (added)
+++ servicemix/smx4/kernel/trunk/demos/smx4web/pom.xml Mon Jan 19 23:24:55 2009
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.servicemix.kernel</groupId>
+    <artifactId>org.apache.servicemix.kernel.demos</artifactId>
+    <version>1.1.0-SNAPSHOT</version>
+  </parent>
+
+  <groupId>org.apache.servicemix.kernel.demos</groupId>
+  <artifactId>smx4web</artifactId>
+  <packaging>war</packaging>
+  <name>Apache ServiceMix Kernel :: Demos :: smx4web</name>
+  
+  <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>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.servicemix.kernel</groupId>
+      <artifactId>org.apache.servicemix.kernel.main</artifactId>
+      <version>${servicemix.kernel.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.kernel</groupId>
+        <artifactId>apache-servicemix-kernel</artifactId>
+        <version>${servicemix.kernel.version}</version>
+        <type>zip</type>
+        <exclusions>
+            <exclusion>
+                <groupId>org.apache.servicemix.kernel</groupId>
+                <artifactId>org.apache.servicemix.kernel.client</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.apache.servicemix.kernel</groupId>
+                <artifactId>org.apache.servicemix.kernel.filemonitor</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.apache.servicemix.kernel</groupId>
+                <artifactId>org.apache.servicemix.kernel.spring</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.apache.servicemix.kernel.gshell</groupId>
+                <artifactId>org.apache.servicemix.kernel.gshell.core</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.apache.servicemix.kernel.gshell</groupId>
+                <artifactId>org.apache.servicemix.kernel.gshell.admin</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.apache.servicemix.kernel.gshell</groupId>
+                <artifactId>org.apache.servicemix.kernel.gshell.obr</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.apache.servicemix.kernel.gshell</groupId>
+                <artifactId>org.apache.servicemix.kernel.gshell.osgi</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.apache.servicemix.kernel.gshell</groupId>
+                <artifactId>org.apache.servicemix.kernel.gshell.log</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.apache.servicemix.kernel.gshell</groupId>
+                <artifactId>org.apache.servicemix.kernel.gshell.features</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.apache.servicemix.kernel.gshell</groupId>
+                <artifactId>org.apache.servicemix.kernel.gshell.config</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.apache.servicemix.kernel.gshell</groupId>
+                <artifactId>org.apache.servicemix.kernel.gshell.packages</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.apache.servicemix.kernel.jaas</groupId>
+                <artifactId>org.apache.servicemix.kernel.jaas.config</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.apache.servicemix.kernel.jaas</groupId>
+                <artifactId>org.apache.servicemix.kernel.jaas.keystore</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.springframework.osgi</groupId>
+                <artifactId>spring-osgi-extender</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.springframework.osgi</groupId>
+                <artifactId>spring-osgi-core</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.springframework.osgi</groupId>
+                <artifactId>spring-osgi-io</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-context</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-beans</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-core</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-aop</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.bundlerepository</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.configadmin</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.prefs</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.osgi.compendium</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.apache.servicemix.bundles</groupId>
+                <artifactId>org.apache.servicemix.bundles.mina</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.apache.servicemix.bundles</groupId>
+                <artifactId>org.apache.servicemix.bundles.aopalliance</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.apache.servicemix.bundles</groupId>
+                <artifactId>org.apache.servicemix.bundles.asm</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.apache.servicemix.bundles</groupId>
+                <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.apache.servicemix.bundles</groupId>
+                <artifactId>org.apache.servicemix.bundles.ant</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.ops4j.pax.logging</groupId>
+                <artifactId>pax-logging-service</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.ops4j.pax.logging</groupId>
+                <artifactId>pax-logging-api</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.ops4j.pax.url</groupId>
+                <artifactId>pax-url-mvn</artifactId>
+            </exclusion>
+        </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-servlet_2.5_spec</artifactId>
+      <version>${geronimo.servlet.version}</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <warSourceDirectory>src/main/webapp/</warSourceDirectory>
+          <webResources>
+            <resource>
+              <directory>target/kernel</directory>
+            </resource>
+          </webResources>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>maven-jetty-plugin</artifactId>
+        <version>${jetty.version}</version>
+        <configuration>
+          <connectors>
+            <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+              <port>${jetty.port}</port>
+              <maxIdleTime>60000</maxIdleTime>
+            </connector>
+          </connectors>
+          <systemProperties>
+            <!-- enable easy connection to JConsole -->
+            <systemProperty>
+              <name>com.sun.management.jmxremote</name>
+              <value></value>
+            </systemProperty>
+          </systemProperties>
+          <scanIntervalSeconds>10</scanIntervalSeconds>
+          <webAppSourceDirectory>${project.build.directory}/${project.build.finalName}</webAppSourceDirectory>
+        </configuration>
+      </plugin>
+      <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <version>2.0</version>
+          <executions>
+              <execution>
+                  <id>unpack-unix</id>
+                  <phase>generate-resources</phase>
+                  <goals>
+                      <goal>unpack</goal>
+                  </goals>
+                  <configuration>
+                      <artifactItems>
+                          <artifactItem>
+                              <groupId>org.apache.servicemix.kernel</groupId>
+                              <artifactId>apache-servicemix-kernel</artifactId>
+                              <version>${servicemix.kernel.version}</version>
+                              <type>zip</type>
+                              <outputDirectory>${project.build.directory}/kernel/WEB-INF</outputDirectory>
+                              <excludes>**/lib/*,**/*.txt,**/bin/*,**/lib,**/bin</excludes>
+                          </artifactItem>
+                      </artifactItems>
+                  </configuration>
+              </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

Added: servicemix/smx4/kernel/trunk/demos/smx4web/src/main/java/org/apache/servicemix/smx4webex/WebAppListener.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/demos/smx4web/src/main/java/org/apache/servicemix/smx4webex/WebAppListener.java?rev=735950&view=auto
==============================================================================
--- servicemix/smx4/kernel/trunk/demos/smx4web/src/main/java/org/apache/servicemix/smx4webex/WebAppListener.java (added)
+++ servicemix/smx4/kernel/trunk/demos/smx4web/src/main/java/org/apache/servicemix/smx4webex/WebAppListener.java Mon Jan 19 23:24:55 2009
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.servicemix.smx4webex;
+
+import java.io.File;
+
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletContextEvent;
+
+import org.apache.servicemix.kernel.main.Main;
+
+public class WebAppListener implements ServletContextListener {
+	
+	private Main main;
+	
+	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();
+			System.err.println("Root: " + root);
+			System.setProperty("servicemix.home", root);
+			System.setProperty("servicemix.base", root);
+			System.setProperty("servicemix.startLocalConsole", "false");
+			System.setProperty("servicemix.startRemoteShell", "true");
+			main = new Main(new String[0]);
+			main.launch();
+		} catch (Exception e) {
+			main = null;
+			e.printStackTrace();
+		}
+	}
+
+	public void contextDestroyed(ServletContextEvent sce) {
+		try {
+			System.err.println("contextDestroyed");
+			if (main != null) {
+				main.destroy(false);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+}

Added: servicemix/smx4/kernel/trunk/demos/smx4web/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/demos/smx4web/src/main/webapp/WEB-INF/web.xml?rev=735950&view=auto
==============================================================================
--- servicemix/smx4/kernel/trunk/demos/smx4web/src/main/webapp/WEB-INF/web.xml (added)
+++ servicemix/smx4/kernel/trunk/demos/smx4web/src/main/webapp/WEB-INF/web.xml Mon Jan 19 23:24:55 2009
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+   
+    http://www.apache.org/licenses/LICENSE-2.0
+   
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<web-app version="2.4"
+         xmlns="http://java.sun.com/xml/ns/j2ee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+                             http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+  <description>ServiceMix 4 Embedded Example</description>
+  <display-name>ServiceMix 4 Embedded Example</display-name>
+
+  <listener>
+    <listener-class>org.apache.servicemix.smx4webex.WebAppListener</listener-class>
+  </listener>
+
+  <welcome-file-list>
+    <welcome-file>index.jsp</welcome-file>
+  </welcome-file-list>
+		
+</web-app>

Added: servicemix/smx4/kernel/trunk/demos/smx4web/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/demos/smx4web/src/main/webapp/index.jsp?rev=735950&view=auto
==============================================================================
--- servicemix/smx4/kernel/trunk/demos/smx4web/src/main/webapp/index.jsp (added)
+++ servicemix/smx4/kernel/trunk/demos/smx4web/src/main/webapp/index.jsp Mon Jan 19 23:24:55 2009
@@ -0,0 +1,34 @@
+<%--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+   
+    http://www.apache.org/licenses/LICENSE-2.0
+   
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+--%>
+<html>
+<head>
+<title>Apache ServiceMix Kernel</title>
+</head>
+<body>
+
+<h2>Welcome!</h2>
+
+<p>
+Welcome to Apache ServiceMix Kernel web application demo
+</p>
+
+<p>
+You can find more information about ServiceMix Kernel on the <a href="http://servicemix.apache.org/kernel">Apache ServiceMix Kernel Site</a>
+</p>
+</body>
+</html>
+	

Modified: servicemix/smx4/kernel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/pom.xml?rev=735950&r1=735949&r2=735950&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/pom.xml Mon Jan 19 23:24:55 2009
@@ -44,6 +44,7 @@
         <module>client</module>
         <module>management</module>
         <module>assembly</module>
+        <module>demos</module>
     </modules>
 
     <scm>
@@ -74,13 +75,15 @@
         <commons.vfs.version>1.0_1</commons.vfs.version>
         <depends.maven.plugin.version>1.0</depends.maven.plugin.version>
         <easymock.version>2.4</easymock.version>
-        <felix.configadmin.version>1.0.0</felix.configadmin.version>
-        <felix.main.version>1.2.1</felix.main.version>
-        <felix.plugin.version>1.4.1</felix.plugin.version>
-        <felix.framework.version>1.0.4</felix.framework.version>
+        <felix.configadmin.version>1.0.4</felix.configadmin.version>
+        <!--<felix.main.version>1.5.0-SNAPSHOT</felix.main.version>-->
+        <felix.main.version>1.4.1</felix.main.version>
+        <felix.plugin.version>1.4.3</felix.plugin.version>
+        <!--<felix.framework.version>1.5.0-SNAPSHOT</felix.framework.version>-->
+        <felix.framework.version>1.4.1</felix.framework.version>
         <felix.osgi.version>1.2.0</felix.osgi.version>
         <felix.compendium.version>1.2.0</felix.compendium.version>
-        <felix.bundlerepository.version>1.0.2</felix.bundlerepository.version>
+        <felix.bundlerepository.version>1.2.1</felix.bundlerepository.version>
         <felix.prefs.version>1.0.2</felix.prefs.version>
         <geronimo.annotation.version>1.1.1</geronimo.annotation.version>
         <geronimo.servlet.version>1.1.2</geronimo.servlet.version>
@@ -202,6 +205,11 @@
                 <version>${pom.version}</version>
             </dependency>
             <dependency>
+                <groupId>org.apache.servicemix.kernel</groupId>
+                <artifactId>org.apache.servicemix.kernel.demos</artifactId>
+                <version>${pom.version}</version>
+            </dependency> 
+            <dependency>
                 <groupId>org.apache.servicemix.kernel.gshell</groupId>
                 <artifactId>org.apache.servicemix.kernel.gshell.core</artifactId>
                 <version>${pom.version}</version>