Skip to content
Browse files

388823 - Adds a spring integration bundle that creates a class loadin…

…g link between tomcat and spring.web
  • Loading branch information...
1 parent 41da79c commit f1d964df73c19cf2f6088fc48337f239085e3293 @bkapukaranov bkapukaranov committed Sep 17, 2012
View
1 build-web/build.xml
@@ -10,6 +10,7 @@
<path id="bundles">
<path refid="unit.test.bundles" />
<pathelement location="../org.eclipse.virgo.web.test"/>
+ <pathelement location="../org.eclipse.virgo.web.spring.integration"/>
<pathelement location="../org.eclipse.virgo.web.servlet.adapter"/>
<pathelement location="../org.eclipse.virgo.web.tomcat"/>
</path>
View
8 org.eclipse.virgo.web.servlet.adapter/ivy.xml
@@ -1,15 +1,15 @@
<?xml version='1.0' encoding='UTF-8'?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info organisation='org.eclipse.virgo.web' module='${ant.project.name}'/>
+ <info organisation="${project.organisation}" module="${ant.project.name}"/>
<configurations>
- <include file='${virgo.build.dir}/common/default-ivy-configurations.xml'/>
+ <include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
</configurations>
<publications>
- <artifact name='${ant.project.name}'/>
- <artifact name='${ant.project.name}-sources' ext='jar' type='src'/>
+ <artifact name="${ant.project.name}"/>
+ <artifact name="${ant.project.name}-sources" ext="jar" type="src"/>
</publications>
</ivy-module>
View
2 org.eclipse.virgo.web.servlet.adapter/src/main/resources/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Version: 3.5.0
+Bundle-Version: 3.6.0
Bundle-Name: Virgo Web Servlet Adapter
Bundle-SymbolicName: org.eclipse.virgo.web.servlet.adapter
Require-Bundle: javax.servlet
View
7 org.eclipse.virgo.web.spring.integration/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
View
17 org.eclipse.virgo.web.spring.integration/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.virgo.web.spring.integration</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
View
9 org.eclipse.virgo.web.spring.integration/build.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="org.eclipse.virgo.web.spring.integration">
+
+ <property name="disable.bundlor" value="true" />
+ <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../build.versions"/>
+ <import file="${basedir}/../virgo-build/standard/default.xml"/>
+
+</project>
View
14 org.eclipse.virgo.web.spring.integration/ivy.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
+
+ <info organisation="${project.organisation}" module="${ant.project.name}"/>
+ <configurations>
+ <include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
+ </configurations>
+
+ <publications>
+ <artifact name="${ant.project.name}"/>
+ <artifact name="${ant.project.name}-sources" ext="jar" type="src"/>
+ </publications>
+
+</ivy-module>
View
0 org.eclipse.virgo.web.spring.integration/src/main/java/.gitignore
No changes.
View
28 org.eclipse.virgo.web.spring.integration/src/main/resources/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 5, 2006</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
View
2 org.eclipse.virgo.web.test/src/test/resources/META-INF/test.config.properties
@@ -52,7 +52,7 @@ launcher.bundles =\
org.eclipse.virgo.test.properties.include=file:../build.versions,file:../user-ivy.properties
#Equinox Configuration
-osgi.parentClassloader=ext
+osgi.parentClassloader=fwk
osgi.context.bootdelegation=false
osgi.compatibility.bootdelegation=false
osgi.clean=true
View
1 org.eclipse.virgo.web.tomcat/src/org.eclipse.virgo.web.tomcat.plan
@@ -6,6 +6,7 @@
http://www.eclipse.org/virgo/schema/plan/eclipse-virgo-plan.xsd">
<artifact type="configuration" name="org.eclipse.virgo.web"/>
+ <artifact type="bundle" name="org.eclipse.virgo.web.spring.integration" version="[3.0, 4)"/>
<artifact type="bundle" name="org.eclipse.gemini.web.core" version="[2.0, 3.0)"/>
<artifact type="bundle" name="org.eclipse.gemini.web.tomcat" version="[2.0, 3.0)"/>
<artifact type="bundle" name="org.eclipse.virgo.web.core" version="[3.0, 4.0)"/>

0 comments on commit f1d964d

Please sign in to comment.
Something went wrong with that request. Please try again.