Permalink
Browse files

Create an nexus-oss-bundle-template that does not include any plugin …

…and make nexus-oss-webapp build out of this one

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
  • Loading branch information...
1 parent 1cbca80 commit 4fb8bbc76e12237c60c71a1a9a0f9587b3fa39c1 @adreghiciu adreghiciu committed Nov 5, 2012
Showing with 473 additions and 163 deletions.
  1. +260 −0 nexus/nexus-oss-bundle-template/pom.xml
  2. +136 −0 nexus/nexus-oss-bundle-template/src/main/assembly/bundle.xml
  3. 0 nexus/{nexus-oss-webapp → nexus-oss-bundle-template}/src/main/resources/content/LICENSE.txt
  4. 0 nexus/{nexus-oss-webapp → nexus-oss-bundle-template}/src/main/resources/content/NOTICE.txt
  5. 0 ...exus-oss-webapp → nexus-oss-bundle-template}/src/main/resources/content/bin/jsw/conf/wrapper.conf
  6. 0 ...pp → nexus-oss-bundle-template}/src/main/resources/content/bin/jsw/lib/libwrapper-linux-ppc-64.so
  7. 0 ...pp → nexus-oss-bundle-template}/src/main/resources/content/bin/jsw/lib/libwrapper-linux-x86-32.so
  8. 0 ...pp → nexus-oss-bundle-template}/src/main/resources/content/bin/jsw/lib/libwrapper-linux-x86-64.so
  9. 0 ...oss-bundle-template}/src/main/resources/content/bin/jsw/lib/libwrapper-macosx-universal-32.jnilib
  10. 0 ...oss-bundle-template}/src/main/resources/content/bin/jsw/lib/libwrapper-macosx-universal-64.jnilib
  11. 0 ... nexus-oss-bundle-template}/src/main/resources/content/bin/jsw/lib/libwrapper-solaris-sparc-32.so
  12. 0 ... nexus-oss-bundle-template}/src/main/resources/content/bin/jsw/lib/libwrapper-solaris-sparc-64.so
  13. 0 ... → nexus-oss-bundle-template}/src/main/resources/content/bin/jsw/lib/libwrapper-solaris-x86-32.so
  14. 0 ...-oss-webapp → nexus-oss-bundle-template}/src/main/resources/content/bin/jsw/lib/wrapper-3.2.3.jar
  15. 0 ...pp → nexus-oss-bundle-template}/src/main/resources/content/bin/jsw/lib/wrapper-windows-x86-32.dll
  16. 0 ...pp → nexus-oss-bundle-template}/src/main/resources/content/bin/jsw/lib/wrapper-windows-x86-64.dll
  17. 0 ...us-oss-webapp → nexus-oss-bundle-template}/src/main/resources/content/bin/jsw/license/LICENSE.txt
  18. 0 ...w/linux-x86-64 → nexus-oss-bundle-template/src/main/resources/content/bin/jsw/linux-ppc-64}/nexus
  19. 0 ...s-oss-webapp → nexus-oss-bundle-template}/src/main/resources/content/bin/jsw/linux-ppc-64/wrapper
  20. 0 ...xus-oss-webapp → nexus-oss-bundle-template}/src/main/resources/content/bin/jsw/linux-x86-32/nexus
  21. 0 ...s-oss-webapp → nexus-oss-bundle-template}/src/main/resources/content/bin/jsw/linux-x86-32/wrapper
  22. 0 ...w/linux-ppc-64 → nexus-oss-bundle-template/src/main/resources/content/bin/jsw/linux-x86-64}/nexus
  23. 0 ...s-oss-webapp → nexus-oss-bundle-template}/src/main/resources/content/bin/jsw/linux-x86-64/wrapper
  24. 0 ...rsal-64 → nexus-oss-bundle-template/src/main/resources/content/bin/jsw/macosx-universal-32}/nexus
  25. 0 ...ebapp → nexus-oss-bundle-template}/src/main/resources/content/bin/jsw/macosx-universal-32/wrapper
  26. 0 ...rsal-32 → nexus-oss-bundle-template/src/main/resources/content/bin/jsw/macosx-universal-64}/nexus
  27. 0 ...ebapp → nexus-oss-bundle-template}/src/main/resources/content/bin/jsw/macosx-universal-64/wrapper
  28. 0 ...ris-x86-32 → nexus-oss-bundle-template/src/main/resources/content/bin/jsw/solaris-sparc-32}/nexus
  29. 0 ...s-webapp → nexus-oss-bundle-template}/src/main/resources/content/bin/jsw/solaris-sparc-32/wrapper
  30. 0 ...oss-webapp → nexus-oss-bundle-template}/src/main/resources/content/bin/jsw/solaris-sparc-64/nexus
  31. 0 ...s-webapp → nexus-oss-bundle-template}/src/main/resources/content/bin/jsw/solaris-sparc-64/wrapper
  32. 0 ...ris-sparc-32 → nexus-oss-bundle-template/src/main/resources/content/bin/jsw/solaris-x86-32}/nexus
  33. 0 ...→ nexus-oss-bundle-template}/src/main/resources/content/bin/jsw/solaris-x86-32/sample-smf/app.xml
  34. 0 ...exus-oss-bundle-template}/src/main/resources/content/bin/jsw/solaris-x86-32/sample-smf/readme.txt
  35. 0 ...oss-webapp → nexus-oss-bundle-template}/src/main/resources/content/bin/jsw/solaris-x86-32/wrapper
  36. 0 ... → nexus-oss-bundle-template/src/main/resources/content/bin/jsw/windows-x86-32}/console-nexus.bat
  37. 0 ... → nexus-oss-bundle-template/src/main/resources/content/bin/jsw/windows-x86-32}/install-nexus.bat
  38. 0 ...s-x86-64 → nexus-oss-bundle-template/src/main/resources/content/bin/jsw/windows-x86-32}/nexus.bat
  39. 0 ...64 → nexus-oss-bundle-template/src/main/resources/content/bin/jsw/windows-x86-32}/start-nexus.bat
  40. 0 ...-64 → nexus-oss-bundle-template/src/main/resources/content/bin/jsw/windows-x86-32}/stop-nexus.bat
  41. 0 ... nexus-oss-bundle-template/src/main/resources/content/bin/jsw/windows-x86-32}/uninstall-nexus.bat
  42. 0 ...webapp → nexus-oss-bundle-template}/src/main/resources/content/bin/jsw/windows-x86-32/wrapper.exe
  43. 0 ... → nexus-oss-bundle-template/src/main/resources/content/bin/jsw/windows-x86-64}/console-nexus.bat
  44. 0 ... → nexus-oss-bundle-template/src/main/resources/content/bin/jsw/windows-x86-64}/install-nexus.bat
  45. 0 ...s-x86-32 → nexus-oss-bundle-template/src/main/resources/content/bin/jsw/windows-x86-64}/nexus.bat
  46. 0 ...32 → nexus-oss-bundle-template/src/main/resources/content/bin/jsw/windows-x86-64}/start-nexus.bat
  47. 0 ...-32 → nexus-oss-bundle-template/src/main/resources/content/bin/jsw/windows-x86-64}/stop-nexus.bat
  48. 0 ... nexus-oss-bundle-template/src/main/resources/content/bin/jsw/windows-x86-64}/uninstall-nexus.bat
  49. 0 ...webapp → nexus-oss-bundle-template}/src/main/resources/content/bin/jsw/windows-x86-64/wrapper.exe
  50. 0 nexus/{nexus-oss-webapp → nexus-oss-bundle-template}/src/main/resources/content/bin/nexus
  51. 0 nexus/{nexus-oss-webapp → nexus-oss-bundle-template}/src/main/resources/content/bin/nexus.bat
  52. 0 ...us-oss-webapp → nexus-oss-bundle-template}/src/main/resources/content/conf/examples/jetty-ajp.xml
  53. 0 ...nexus-oss-bundle-template}/src/main/resources/content/conf/examples/jetty-dual-ports-with-ssl.xml
  54. 0 ...pp → nexus-oss-bundle-template}/src/main/resources/content/conf/examples/jetty-faster-windows.xml
  55. 0 ...app → nexus-oss-bundle-template}/src/main/resources/content/conf/examples/jetty-header-buffer.xml
  56. 0 ...us-oss-webapp → nexus-oss-bundle-template}/src/main/resources/content/conf/examples/jetty-jmx.xml
  57. 0 ... nexus-oss-bundle-template}/src/main/resources/content/conf/examples/jetty-simple-https-proxy.xml
  58. 0 ...us-oss-webapp → nexus-oss-bundle-template}/src/main/resources/content/conf/examples/jetty-ssl.xml
  59. 0 ...{nexus-oss-webapp → nexus-oss-bundle-template}/src/main/resources/content/conf/examples/jetty.xml
  60. 0 ...pp → nexus-oss-bundle-template}/src/main/resources/content/conf/examples/proxy-https/apache2.conf
  61. 0 ...ebapp → nexus-oss-bundle-template}/src/main/resources/content/conf/examples/proxy-https/jetty.xml
  62. 0 ...nexus-oss-webapp → nexus-oss-bundle-template}/src/main/resources/content/conf/examples/readme.txt
  63. 0 nexus/{nexus-oss-webapp → nexus-oss-bundle-template}/src/main/resources/content/conf/jetty.xml
  64. 0 nexus/{nexus-oss-webapp → nexus-oss-bundle-template}/src/main/resources/content/conf/logback.xml
  65. 0 ...s/{nexus-oss-webapp → nexus-oss-bundle-template}/src/main/resources/content/conf/nexus.properties
  66. 0 ...ces/sonatype-work/nexus → nexus-oss-bundle-template/src/main/resources/content/logs}/.placeholder
  67. 0 nexus/{nexus-oss-webapp → nexus-oss-bundle-template}/src/main/resources/content/tmp/.placeholder
  68. 0 nexus/{nexus-oss-webapp → nexus-oss-bundle-template}/src/main/resources/sonatype-work/README.txt
  69. 0 ...ces/content/logs → nexus-oss-bundle-template/src/main/resources/sonatype-work/nexus}/.placeholder
  70. +48 −87 nexus/nexus-oss-webapp/pom.xml
  71. +20 −76 nexus/nexus-oss-webapp/src/main/assembly/bundle.xml
  72. +9 −0 nexus/pom.xml
View
260 nexus/nexus-oss-bundle-template/pom.xml
@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Sonatype Nexus (TM) Open Source Version
+ Copyright (c) 2007-2012 Sonatype, Inc.
+ All rights reserved. Includes the third-party code listed at http://links.sonatype.com/products/nexus/oss/attributions.
+
+ This program and the accompanying materials are made available under the terms of the Eclipse Public License Version 1.0,
+ which accompanies this distribution and is available at http://www.eclipse.org/legal/epl-v10.html.
+
+ Sonatype Nexus (TM) Professional Version is available from Sonatype, Inc. "Sonatype" and "Sonatype Nexus" are trademarks
+ of Sonatype, Inc. Apache Maven is a trademark of the Apache Software Foundation. M2eclipse is a trademark of the
+ Eclipse Foundation. All other trademarks are the property of their respective owners.
+
+-->
+<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.sonatype.nexus</groupId>
+ <artifactId>nexus</artifactId>
+ <version>2.3-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>nexus-oss-bundle-template</artifactId>
+ <packaging>pom</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.sonatype.nexus</groupId>
+ <artifactId>nexus-webapp</artifactId>
+ <type>war</type>
+ </dependency>
+
+ <!-- The "runtime bundle" -->
+ <dependency>
+ <groupId>org.sonatype.nexus</groupId>
+ <artifactId>nexus-bootstrap</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.sonatype.appcontext</groupId>
+ <artifactId>appcontext</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.sonatype.sisu</groupId>
+ <artifactId>sisu-jetty8</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-interpolation</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.sonatype.nexus</groupId>
+ <artifactId>nexus-logging-extras-appender</artifactId>
+ </dependency>
+
+ <!-- Jetty -->
+ <dependency>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-continuation</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-xml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-deploy</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-rewrite</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-jmx</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/target/assembly</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/assembly</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>target/assembly/bundle.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>bundle</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>tattletale</id>
+ <activation>
+ <property>
+ <name>it</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <!--
+ Extract the distribution, so that tattletale can inspect it. Could potentially include dir format, but unsure if m-assembly-p would behave itself.
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.sonatype.nexus</groupId>
+ <artifactId>nexus-oss-bundle-template</artifactId>
+ <classifier>bundle</classifier>
+ <type>zip</type>
+ <outputDirectory>${project.build.directory}/tattletale/dist</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.jboss.tattletale</groupId>
+ <artifactId>tattletale-maven</artifactId>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ <configuration>
+ <source>${project.build.directory}/tattletale/dist</source>
+ <destination>${project.build.directory}/tattletale/report</destination>
+ <reports>
+ <!-- FIXME: There are some reports disable here, probably shouldn't be -->
+ <report>classdependants</report>
+ <report>classdependson</report>
+ <report>dependants</report>
+ <report>dependson</report>
+ <report>graphviz</report>
+ <report>transitivedependants</report>
+ <report>transitivedependson</report>
+ <!--<report>circulardependency</report>-->
+ <report>classlocation</report>
+ <!--<report>osgi</report>-->
+ <report>sealed</report>
+ <report>sign</report>
+ <report>eliminatejars</report>
+ <!--<report>invalidversion</report>-->
+ <report>multiplejars</report>
+ <report>multiplejarspackage</report>
+ <report>multiplelocations</report>
+ <report>unusedjar</report>
+ <report>blacklisted</report>
+ <!--<report>noversion</report>-->
+ <report>jar</report>
+ </reports>
+ <excludes>
+ <!-- FIXME: I hate this too, but other pattern did not help (ie. xmlpull-*.jar) At least build will fail anyway if version changes... -->
+ <exclude>**/xmlpull-1.1.3.1.jar</exclude>
+ <!-- FIXME: Remove once Commons Beanutils 1.8.4 is released and we upgrade to it, see BEANUTILS-379 -->
+ <exclude>**/commons-beanutils-core-1.7.0.jar</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
View
136 nexus/nexus-oss-bundle-template/src/main/assembly/bundle.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Sonatype Nexus (TM) Open Source Version
+ Copyright (c) 2007-2012 Sonatype, Inc.
+ All rights reserved. Includes the third-party code listed at http://links.sonatype.com/products/nexus/oss/attributions.
+
+ This program and the accompanying materials are made available under the terms of the Eclipse Public License Version 1.0,
+ which accompanies this distribution and is available at http://www.eclipse.org/legal/epl-v10.html.
+
+ Sonatype Nexus (TM) Professional Version is available from Sonatype, Inc. "Sonatype" and "Sonatype Nexus" are trademarks
+ of Sonatype, Inc. Apache Maven is a trademark of the Apache Software Foundation. M2eclipse is a trademark of the
+ Eclipse Foundation. All other trademarks are the property of their respective owners.
+
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+
+ <id>bundle</id>
+
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <directory>src/main/resources/content</directory>
+ <outputDirectory>${project.build.finalName}</outputDirectory>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ <excludes>
+ <exclude>**/sonatype-work/**</exclude>
+ <exclude>**/nexus</exclude>
+ <exclude>**/*.bat</exclude>
+ <exclude>**/wrapper*</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- chmod +x all JSW wrapper bits -->
+ <fileSet>
+ <directory>src/main/resources/content</directory>
+ <outputDirectory>${project.build.finalName}</outputDirectory>
+ <fileMode>0755</fileMode>
+ <directoryMode>0755</directoryMode>
+ <includes>
+ <include>**/wrapper*</include>
+ </includes>
+ </fileSet>
+
+ <!-- chmod +x unix scripts -->
+ <fileSet>
+ <directory>src/main/resources/content</directory>
+ <outputDirectory>${project.build.finalName}</outputDirectory>
+ <fileMode>0755</fileMode>
+ <directoryMode>0755</directoryMode>
+ <lineEnding>unix</lineEnding>
+ <includes>
+ <include>**/nexus</include>
+ </includes>
+ </fileSet>
+
+ <!-- batch files -->
+ <fileSet>
+ <directory>src/main/resources/content</directory>
+ <outputDirectory>${project.build.finalName}</outputDirectory>
+ <fileMode>0755</fileMode>
+ <directoryMode>0755</directoryMode>
+ <lineEnding>dos</lineEnding>
+ <includes>
+ <include>**/*.bat</include>
+ </includes>
+ </fileSet>
+
+ <!-- sonatype-work directory -->
+ <fileSet>
+ <directory>src/main/resources/sonatype-work</directory>
+ <outputDirectory>sonatype-work</outputDirectory>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ <excludes>
+ <exclude>**/.placeholder</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>${project.build.finalName}/nexus</outputDirectory>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useStrictFiltering>true</useStrictFiltering>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ <includes>
+ <include>*:nexus-webapp:war</include>
+ </includes>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/**</exclude>
+ <exclude>WEB-INF/lib/appcontext*.jar</exclude>
+ <exclude>WEB-INF/lib/slf4j-api*.jar</exclude>
+ <exclude>WEB-INF/lib/logback-core*.jar</exclude>
+ <exclude>WEB-INF/lib/logback-classic*.jar</exclude>
+ <exclude>WEB-INF/lib/nexus-logging-extras-appender*.jar</exclude>
+ <exclude>WEB-INF/classes/logback.xml</exclude>
+ <exclude>WEB-INF/optional-plugins/**</exclude>
+ <exclude>WEB-INF/plugin-repository/**</exclude>
+ </excludes>
+ </unpackOptions>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>${project.build.finalName}/lib</outputDirectory>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useStrictFiltering>true</useStrictFiltering>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ <includes>
+ <include>org.sonatype.nexus:nexus-bootstrap</include>
+ <include>org.sonatype.nexus:nexus-logging-extras-appender</include>
+ <include>org.eclipse.jetty.orbit:javax.servlet</include>
+ <include>org.eclipse.jetty:*</include>
+ <include>org.codehaus.plexus:*</include>
+ <include>org.sonatype.sisu:*</include>
+ <include>org.sonatype.appcontext:*</include>
+ <include>org.slf4j:*</include>
+ <include>ch.qos.logback:*</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
View
0 ...pp/src/main/resources/content/LICENSE.txt → ...te/src/main/resources/content/LICENSE.txt
File renamed without changes.
View
0 ...app/src/main/resources/content/NOTICE.txt → ...ate/src/main/resources/content/NOTICE.txt
File renamed without changes.
View
0 ...sources/content/bin/jsw/conf/wrapper.conf → ...sources/content/bin/jsw/conf/wrapper.conf
File renamed without changes.
View
0 ...nt/bin/jsw/lib/libwrapper-linux-ppc-64.so → ...nt/bin/jsw/lib/libwrapper-linux-ppc-64.so
File renamed without changes.
View
0 ...nt/bin/jsw/lib/libwrapper-linux-x86-32.so → ...nt/bin/jsw/lib/libwrapper-linux-x86-32.so
File renamed without changes.
View
0 ...nt/bin/jsw/lib/libwrapper-linux-x86-64.so → ...nt/bin/jsw/lib/libwrapper-linux-x86-64.so
File renamed without changes.
View
0 ...lib/libwrapper-macosx-universal-32.jnilib → ...lib/libwrapper-macosx-universal-32.jnilib
File renamed without changes.
View
0 ...lib/libwrapper-macosx-universal-64.jnilib → ...lib/libwrapper-macosx-universal-64.jnilib
File renamed without changes.
View
0 ...in/jsw/lib/libwrapper-solaris-sparc-32.so → ...in/jsw/lib/libwrapper-solaris-sparc-32.so
File renamed without changes.
View
0 ...in/jsw/lib/libwrapper-solaris-sparc-64.so → ...in/jsw/lib/libwrapper-solaris-sparc-64.so
File renamed without changes.
View
0 .../bin/jsw/lib/libwrapper-solaris-x86-32.so → .../bin/jsw/lib/libwrapper-solaris-x86-32.so
File renamed without changes.
View
0 ...ces/content/bin/jsw/lib/wrapper-3.2.3.jar → ...ces/content/bin/jsw/lib/wrapper-3.2.3.jar
File renamed without changes.
View
0 ...nt/bin/jsw/lib/wrapper-windows-x86-32.dll → ...nt/bin/jsw/lib/wrapper-windows-x86-32.dll
File renamed without changes.
View
0 ...nt/bin/jsw/lib/wrapper-windows-x86-64.dll → ...nt/bin/jsw/lib/wrapper-windows-x86-64.dll
File renamed without changes.
View
0 ...urces/content/bin/jsw/license/LICENSE.txt → ...urces/content/bin/jsw/license/LICENSE.txt
File renamed without changes.
View
0 ...ources/content/bin/jsw/linux-x86-64/nexus → ...ources/content/bin/jsw/linux-ppc-64/nexus
File renamed without changes.
View
0 ...rces/content/bin/jsw/linux-ppc-64/wrapper → ...rces/content/bin/jsw/linux-ppc-64/wrapper
File renamed without changes.
View
0 ...ources/content/bin/jsw/linux-x86-32/nexus → ...ources/content/bin/jsw/linux-x86-32/nexus
File renamed without changes.
View
0 ...rces/content/bin/jsw/linux-x86-32/wrapper → ...rces/content/bin/jsw/linux-x86-32/wrapper
File renamed without changes.
View
0 ...ources/content/bin/jsw/linux-ppc-64/nexus → ...ources/content/bin/jsw/linux-x86-64/nexus
File renamed without changes.
View
0 ...rces/content/bin/jsw/linux-x86-64/wrapper → ...rces/content/bin/jsw/linux-x86-64/wrapper
File renamed without changes.
View
0 ...content/bin/jsw/macosx-universal-64/nexus → ...content/bin/jsw/macosx-universal-32/nexus
File renamed without changes.
View
0 ...ntent/bin/jsw/macosx-universal-32/wrapper → ...ntent/bin/jsw/macosx-universal-32/wrapper
File renamed without changes.
View
0 ...content/bin/jsw/macosx-universal-32/nexus → ...content/bin/jsw/macosx-universal-64/nexus
File renamed without changes.
View
0 ...ntent/bin/jsw/macosx-universal-64/wrapper → ...ntent/bin/jsw/macosx-universal-64/wrapper
File renamed without changes.
View
0 ...rces/content/bin/jsw/solaris-x86-32/nexus → ...es/content/bin/jsw/solaris-sparc-32/nexus
File renamed without changes.
View
0 .../content/bin/jsw/solaris-sparc-32/wrapper → .../content/bin/jsw/solaris-sparc-32/wrapper
File renamed without changes.
View
0 ...es/content/bin/jsw/solaris-sparc-64/nexus → ...es/content/bin/jsw/solaris-sparc-64/nexus
File renamed without changes.
View
0 .../content/bin/jsw/solaris-sparc-64/wrapper → .../content/bin/jsw/solaris-sparc-64/wrapper
File renamed without changes.
View
0 ...es/content/bin/jsw/solaris-sparc-32/nexus → ...rces/content/bin/jsw/solaris-x86-32/nexus
File renamed without changes.
View
0 ...bin/jsw/solaris-x86-32/sample-smf/app.xml → ...bin/jsw/solaris-x86-32/sample-smf/app.xml
File renamed without changes.
View
0 .../jsw/solaris-x86-32/sample-smf/readme.txt → .../jsw/solaris-x86-32/sample-smf/readme.txt
File renamed without changes.
View
0 ...es/content/bin/jsw/solaris-x86-32/wrapper → ...es/content/bin/jsw/solaris-x86-32/wrapper
File renamed without changes.
View
0 .../bin/jsw/windows-x86-64/console-nexus.bat → .../bin/jsw/windows-x86-32/console-nexus.bat
File renamed without changes.
View
0 .../bin/jsw/windows-x86-64/install-nexus.bat → .../bin/jsw/windows-x86-32/install-nexus.bat
File renamed without changes.
View
0 .../content/bin/jsw/windows-x86-64/nexus.bat → .../content/bin/jsw/windows-x86-32/nexus.bat
File renamed without changes.
View
0 ...nt/bin/jsw/windows-x86-64/start-nexus.bat → ...nt/bin/jsw/windows-x86-32/start-nexus.bat
File renamed without changes.
View
0 ...ent/bin/jsw/windows-x86-64/stop-nexus.bat → ...ent/bin/jsw/windows-x86-32/stop-nexus.bat
File renamed without changes.
View
0 ...in/jsw/windows-x86-64/uninstall-nexus.bat → ...in/jsw/windows-x86-32/uninstall-nexus.bat
File renamed without changes.
View
0 ...ontent/bin/jsw/windows-x86-32/wrapper.exe → ...ontent/bin/jsw/windows-x86-32/wrapper.exe
File renamed without changes.
View
0 .../bin/jsw/windows-x86-32/console-nexus.bat → .../bin/jsw/windows-x86-64/console-nexus.bat
File renamed without changes.
View
0 .../bin/jsw/windows-x86-32/install-nexus.bat → .../bin/jsw/windows-x86-64/install-nexus.bat
File renamed without changes.
View
0 .../content/bin/jsw/windows-x86-32/nexus.bat → .../content/bin/jsw/windows-x86-64/nexus.bat
File renamed without changes.
View
0 ...nt/bin/jsw/windows-x86-32/start-nexus.bat → ...nt/bin/jsw/windows-x86-64/start-nexus.bat
File renamed without changes.
View
0 ...ent/bin/jsw/windows-x86-32/stop-nexus.bat → ...ent/bin/jsw/windows-x86-64/stop-nexus.bat
File renamed without changes.
View
0 ...in/jsw/windows-x86-32/uninstall-nexus.bat → ...in/jsw/windows-x86-64/uninstall-nexus.bat
File renamed without changes.
View
0 ...ontent/bin/jsw/windows-x86-64/wrapper.exe → ...ontent/bin/jsw/windows-x86-64/wrapper.exe
File renamed without changes.
View
0 ...bapp/src/main/resources/content/bin/nexus → ...late/src/main/resources/content/bin/nexus
File renamed without changes.
View
0 .../src/main/resources/content/bin/nexus.bat → .../src/main/resources/content/bin/nexus.bat
File renamed without changes.
View
0 ...urces/content/conf/examples/jetty-ajp.xml → ...urces/content/conf/examples/jetty-ajp.xml
File renamed without changes.
View
0 ...nf/examples/jetty-dual-ports-with-ssl.xml → ...nf/examples/jetty-dual-ports-with-ssl.xml
File renamed without changes.
View
0 ...nt/conf/examples/jetty-faster-windows.xml → ...nt/conf/examples/jetty-faster-windows.xml
File renamed without changes.
View
0 ...ent/conf/examples/jetty-header-buffer.xml → ...ent/conf/examples/jetty-header-buffer.xml
File renamed without changes.
View
0 ...urces/content/conf/examples/jetty-jmx.xml → ...urces/content/conf/examples/jetty-jmx.xml
File renamed without changes.
View
0 ...onf/examples/jetty-simple-https-proxy.xml → ...onf/examples/jetty-simple-https-proxy.xml
File renamed without changes.
View
0 ...urces/content/conf/examples/jetty-ssl.xml → ...urces/content/conf/examples/jetty-ssl.xml
File renamed without changes.
View
0 ...resources/content/conf/examples/jetty.xml → ...resources/content/conf/examples/jetty.xml
File renamed without changes.
View
0 ...nt/conf/examples/proxy-https/apache2.conf → ...nt/conf/examples/proxy-https/apache2.conf
File renamed without changes.
View
0 ...ntent/conf/examples/proxy-https/jetty.xml → ...ntent/conf/examples/proxy-https/jetty.xml
File renamed without changes.
View
0 ...esources/content/conf/examples/readme.txt → ...esources/content/conf/examples/readme.txt
File renamed without changes.
View
0 ...src/main/resources/content/conf/jetty.xml → ...src/main/resources/content/conf/jetty.xml
File renamed without changes.
View
0 ...c/main/resources/content/conf/logback.xml → ...c/main/resources/content/conf/logback.xml
File renamed without changes.
View
0 ...n/resources/content/conf/nexus.properties → ...n/resources/content/conf/nexus.properties
File renamed without changes.
View
0 ...esources/sonatype-work/nexus/.placeholder → .../main/resources/content/logs/.placeholder
File renamed without changes.
View
0 ...c/main/resources/content/tmp/.placeholder → ...c/main/resources/content/tmp/.placeholder
File renamed without changes.
View
0 ...c/main/resources/sonatype-work/README.txt → ...c/main/resources/sonatype-work/README.txt
File renamed without changes.
View
0 .../main/resources/content/logs/.placeholder → ...esources/sonatype-work/nexus/.placeholder
File renamed without changes.
View
135 nexus/nexus-oss-webapp/pom.xml
@@ -34,96 +34,16 @@
<dependencies>
<dependency>
<groupId>org.sonatype.nexus</groupId>
- <artifactId>nexus-webapp</artifactId>
- <type>war</type>
+ <artifactId>nexus-oss-bundle-template</artifactId>
+ <classifier>bundle</classifier>
+ <type>zip</type>
+ <scope>provided</scope>
</dependency>
-
- <!-- The "runtime bundle" -->
<dependency>
<groupId>org.sonatype.nexus</groupId>
- <artifactId>nexus-bootstrap</artifactId>
- </dependency>
- <dependency>
- <groupId>org.sonatype.appcontext</groupId>
- <artifactId>appcontext</artifactId>
- </dependency>
- <dependency>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-jetty8</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-interpolation</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </dependency>
- <dependency>
- <groupId>org.sonatype.nexus</groupId>
- <artifactId>nexus-logging-extras-appender</artifactId>
- </dependency>
-
- <!-- Jetty -->
- <dependency>
- <groupId>org.eclipse.jetty.orbit</groupId>
- <artifactId>javax.servlet</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-continuation</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-http</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-io</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-security</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-xml</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-deploy</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-rewrite</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-jmx</artifactId>
+ <artifactId>nexus-webapp</artifactId>
+ <type>war</type>
+ <scope>provided</scope>
</dependency>
</dependencies>
@@ -150,6 +70,47 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-nexus-webapp</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.sonatype.nexus</groupId>
+ <artifactId>nexus-webapp</artifactId>
+ <type>war</type>
+ <outputDirectory>${project.build.directory}/dependency/war</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>unpack-nexus-oss-webapp</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.sonatype.nexus</groupId>
+ <artifactId>nexus-oss-bundle-template</artifactId>
+ <classifier>bundle</classifier>
+ <type>zip</type>
+ <outputDirectory>${project.build.directory}/dependency/bundle</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
View
96 nexus/nexus-oss-webapp/src/main/assembly/bundle.xml
@@ -26,109 +26,53 @@
<fileSets>
<fileSet>
- <directory>src/main/resources/content</directory>
- <outputDirectory>${project.build.finalName}</outputDirectory>
- <fileMode>0644</fileMode>
- <directoryMode>0755</directoryMode>
+ <directory>${project.build.directory}/dependency/bundle/nexus-oss-bundle-template-${project.version}</directory>
<excludes>
- <exclude>**/sonatype-work/**</exclude>
<exclude>**/nexus</exclude>
<exclude>**/*.bat</exclude>
- <exclude>**/wrapper*</exclude>
+ <exclude>**/*.exe</exclude>
+ <exclude>**/wrapper</exclude>
+ <exclude>**/wrapper-*.jar</exclude>
</excludes>
- </fileSet>
-
- <!-- chmod +x all JSW wrapper bits -->
- <fileSet>
- <directory>src/main/resources/content</directory>
<outputDirectory>${project.build.finalName}</outputDirectory>
- <fileMode>0755</fileMode>
+ <fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
- <includes>
- <include>**/wrapper*</include>
- </includes>
</fileSet>
- <!-- chmod +x unix scripts -->
<fileSet>
- <directory>src/main/resources/content</directory>
- <outputDirectory>${project.build.finalName}</outputDirectory>
- <fileMode>0755</fileMode>
- <directoryMode>0755</directoryMode>
- <lineEnding>unix</lineEnding>
+ <directory>${project.build.directory}/dependency/bundle/nexus-oss-bundle-template-${project.version}</directory>
<includes>
<include>**/nexus</include>
+ <include>**/*.bat</include>
+ <include>**/*.exe</include>
+ <include>**/wrapper</include>
+ <include>**/wrapper-*.jar</include>
</includes>
- </fileSet>
-
- <!-- batch files -->
- <fileSet>
- <directory>src/main/resources/content</directory>
<outputDirectory>${project.build.finalName}</outputDirectory>
<fileMode>0755</fileMode>
<directoryMode>0755</directoryMode>
- <lineEnding>dos</lineEnding>
- <includes>
- <include>**/*.bat</include>
- </includes>
</fileSet>
- <!-- sonatype-work directory -->
<fileSet>
- <directory>src/main/resources/sonatype-work</directory>
+ <directory>${project.build.directory}/dependency/bundle/sonatype-work</directory>
<outputDirectory>sonatype-work</outputDirectory>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
- <excludes>
- <exclude>**/.placeholder</exclude>
- </excludes>
</fileSet>
- </fileSets>
- <dependencySets>
- <dependencySet>
- <outputDirectory>${project.build.finalName}/nexus</outputDirectory>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- <useProjectArtifact>false</useProjectArtifact>
- <useStrictFiltering>true</useStrictFiltering>
+ <fileSet>
+ <directory>${project.build.directory}/dependency/war/WEB-INF/optional-plugins</directory>
+ <outputDirectory>${project.build.finalName}/nexus/WEB-INF/optional-plugins</outputDirectory>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
- <includes>
- <include>*:nexus-webapp:war</include>
- </includes>
- <unpack>true</unpack>
- <unpackOptions>
- <excludes>
- <exclude>META-INF/**</exclude>
- <exclude>WEB-INF/lib/appcontext*.jar</exclude>
- <exclude>WEB-INF/lib/slf4j-api*.jar</exclude>
- <exclude>WEB-INF/lib/logback-core*.jar</exclude>
- <exclude>WEB-INF/lib/logback-classic*.jar</exclude>
- <exclude>WEB-INF/lib/nexus-logging-extras-appender*.jar</exclude>
- <exclude>WEB-INF/classes/logback.xml</exclude>
- </excludes>
- </unpackOptions>
- </dependencySet>
+ </fileSet>
- <dependencySet>
- <outputDirectory>${project.build.finalName}/lib</outputDirectory>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- <useProjectArtifact>false</useProjectArtifact>
- <useStrictFiltering>true</useStrictFiltering>
+ <fileSet>
+ <directory>${project.build.directory}/dependency/war/WEB-INF/plugin-repository</directory>
+ <outputDirectory>${project.build.finalName}/nexus/WEB-INF/plugin-repository</outputDirectory>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
- <includes>
- <include>org.sonatype.nexus:nexus-bootstrap</include>
- <include>org.sonatype.nexus:nexus-logging-extras-appender</include>
- <include>org.eclipse.jetty.orbit:javax.servlet</include>
- <include>org.eclipse.jetty:*</include>
- <include>org.codehaus.plexus:*</include>
- <include>org.sonatype.sisu:*</include>
- <include>org.sonatype.appcontext:*</include>
- <include>org.slf4j:*</include>
- <include>ch.qos.logback:*</include>
- </includes>
- </dependencySet>
- </dependencySets>
+ </fileSet>
+ </fileSets>
</assembly>
View
9 nexus/pom.xml
@@ -1171,6 +1171,14 @@
<dependency>
<groupId>org.sonatype.nexus</groupId>
+ <artifactId>nexus-oss-bundle-template</artifactId>
+ <version>${project.version}</version>
+ <classifier>bundle</classifier>
+ <type>zip</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.sonatype.nexus</groupId>
<artifactId>nexus-plugin-api</artifactId>
<version>${project.version}</version>
</dependency>
@@ -1777,6 +1785,7 @@
<module>nexus-launcher</module>
<module>nexus-client-core</module>
<module>nexus-clients</module>
+ <module>nexus-oss-bundle-template</module>
<module>nexus-oss-webapp</module>
<module>nexus-stories</module>
<module>nexus-test</module>

0 comments on commit 4fb8bbc

Please sign in to comment.