diff options
author | Greg Wilkins | 2011-01-06 18:04:58 +0000 |
---|---|---|
committer | Greg Wilkins | 2011-01-06 18:04:58 +0000 |
commit | 881e5998601c47d928fca88a5ff7a67339a8e1a7 (patch) | |
tree | e5a8ba8ceac059f5c3e9693268b6524019205a63 /jetty-osgi | |
parent | db7d2afe822948ca2da378b45ec8dcee7dc097bc (diff) | |
download | org.eclipse.jetty.project-881e5998601c47d928fca88a5ff7a67339a8e1a7.tar.gz org.eclipse.jetty.project-881e5998601c47d928fca88a5ff7a67339a8e1a7.tar.xz org.eclipse.jetty.project-881e5998601c47d928fca88a5ff7a67339a8e1a7.zip |
333679 Refactored jetty-jmx. Moved mbeans to modules.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2629 7e9141cc-0065-0410-87d8-b60c137991c4
Diffstat (limited to 'jetty-osgi')
-rw-r--r-- | jetty-osgi/example-jetty-osgi/pom.xml | 110 | ||||
-rw-r--r-- | jetty-osgi/example-jetty-osgi/src/configuration/config.ini | 16 | ||||
-rw-r--r-- | jetty-osgi/jetty-osgi-boot/pom.xml | 4 | ||||
-rw-r--r-- | jetty-osgi/pom.xml | 8 | ||||
-rw-r--r-- | jetty-osgi/test-jetty-osgi/pom.xml | 6 |
5 files changed, 16 insertions, 128 deletions
diff --git a/jetty-osgi/example-jetty-osgi/pom.xml b/jetty-osgi/example-jetty-osgi/pom.xml deleted file mode 100644 index b19900ac44..0000000000 --- a/jetty-osgi/example-jetty-osgi/pom.xml +++ /dev/null @@ -1,110 +0,0 @@ -<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"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.eclipse.jetty.osgi</groupId> - <artifactId>jetty-osgi-project</artifactId> - <version>7.3.0-SNAPSHOT</version> - </parent> - <artifactId>example-jetty-osgi</artifactId> - <name>Jetty :: OSGi :: Example</name> - <packaging>pom</packaging> - <properties> - <assembly.directory>target/osgi-example</assembly.directory> - <slf4j.version>1.5.11</slf4j.version> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>generate-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="orbit.base.url" value="http://download.eclipse.org/tools/orbit/downloads/drops/R20090529135407/bundles" /> - <mkdir dir="${assembly.directory}/plugins" /> - <mkdir dir="${assembly.directory}/configuration" /> - <get src="${orbit.base.url}/javax.servlet_2.5.0.v200806031605.jar" dest="${assembly.directory}/plugins/javax.servlet_2.5.0.v200806031605.jar" usetimestamp="true" verbose="true" /> - <copy file="src/configuration/config.ini" todir="${assembly.directory}/configuration" /> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.1</version> - <executions> - <execution> - <id>copy plugins</id> - <phase>generate-resources</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>${assembly.directory}/plugins</outputDirectory> - <excludeArtifactIds>servlet-api,osgi</excludeArtifactIds> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.1</version> - <executions> - <execution> - <id>copy osgi</id> - <phase>generate-resources</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>${assembly.directory}</outputDirectory> - <includeArtifactIds>osgi</includeArtifactIds> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>test-jetty-webapp</artifactId> - <type>war</type> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-webapp</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-deploy</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty.osgi</groupId> - <artifactId>jetty-osgi-boot-warurl</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty.osgi</groupId> - <artifactId>jetty-osgi-boot</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse</groupId> - <artifactId>osgi</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.osgi</groupId> - <artifactId>services</artifactId> - </dependency> - </dependencies> -</project> diff --git a/jetty-osgi/example-jetty-osgi/src/configuration/config.ini b/jetty-osgi/example-jetty-osgi/src/configuration/config.ini deleted file mode 100644 index bd8a432eef..0000000000 --- a/jetty-osgi/example-jetty-osgi/src/configuration/config.ini +++ /dev/null @@ -1,16 +0,0 @@ -osgi.bundles= \ -file:plugins/javax.servlet_2.5.0.v200806031605.jar, \ -file:plugins/jetty-webapp-7.0.2-SNAPSHOT.jar, \ -file:plugins/jetty-deploy-7.0.2-SNAPSHOT.jar, \ -file:plugins/jetty-servlet-7.0.2-SNAPSHOT.jar, \ -file:plugins/jetty-server-7.0.2-SNAPSHOT.jar, \ -file:plugins/jetty-security-7.0.2-SNAPSHOT.jar, \ -file:plugins/jetty-http-7.0.2-SNAPSHOT.jar, \ -file:plugins/jetty-continuation-7.0.2-SNAPSHOT.jar, \ -file:plugins/jetty-xml-7.0.2-SNAPSHOT.jar, \ -file:plugins/jetty-io-7.0.2-SNAPSHOT.jar, \ -file:plugins/jetty-util-7.0.2-SNAPSHOT.jar, \ -file:plugins/services-3.1.200-v20070605.jar, \ -file:plugins/jetty-osgi-boot-7.0.2-SNAPSHOT.jar@1:start, \ -file:plugins/jetty-osgi-boot-warurl-7.0.2-SNAPSHOT.jar@2:start - diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml index ed3908bbf0..575dd065f0 100644 --- a/jetty-osgi/jetty-osgi-boot/pom.xml +++ b/jetty-osgi/jetty-osgi-boot/pom.xml @@ -23,6 +23,10 @@ <artifactId>jetty-deploy</artifactId> </dependency> <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-jmx</artifactId> + </dependency> + <dependency> <groupId>org.eclipse</groupId> <artifactId>osgi</artifactId> </dependency> diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml index cafa77ca7b..5efa7b8243 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -24,8 +24,7 @@ <module>jetty-osgi-boot-logback</module> <module>jetty-osgi-boot-warurl</module> <module>jetty-osgi-httpservice</module> - <module>test-jetty-osgi</module> - <!-- module>example-jetty-osgi</module --> + <!--module>test-jetty-osgi</module--> </modules> <build> <resources> @@ -79,6 +78,11 @@ </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-jmx</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-webapp</artifactId> <version>${project.version}</version> </dependency> diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index 4bca4c17ef..ca15a519a8 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -78,6 +78,12 @@ </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-jmx</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> <version>${project.version}</version> <scope>runtime</scope> |