Browse files

split process-controller and version modules

  • Loading branch information...
1 parent d4991ce commit 55d615c54956131478f3d6b4b375e3de3dae78ea @emuckenhuber emuckenhuber committed with bstansberry Oct 11, 2012
View
12 build/build.xml
@@ -49,7 +49,7 @@
</copy>
<!-- Convert .bat files to DOS line endings -->
<fixcrlf srcdir="${output.dir}/bin" includes="**/*.bat" eol="crlf" />
- <!-- Convert .sh files to Unix line endings -->
+ <!-- Convert .sh files to Unix line endings -->
<fixcrlf srcdir="${output.dir}/bin" includes="**/*.sh" eol="lf" />
<fixcrlf srcdir="${output.dir}/bin" includes="**/*.conf" eol="lf" />
<!-- These files contain digested passwords, which should not be visible to external users -->
@@ -955,15 +955,19 @@
<module-def name="org.jboss.as.security">
<maven-resource group="org.jboss.as" artifact="jboss-as-security"/>
</module-def>
-
+
<module-def name="org.jboss.as.system-jmx">
<maven-resource group="org.jboss.as" artifact="jboss-as-system-jmx"/>
</module-def>
-
+
<module-def name="org.jboss.as.transactions">
<maven-resource group="org.jboss.as" artifact="jboss-as-transactions"/>
</module-def>
+ <module-def name="org.jboss.as.version">
+ <maven-resource group="org.jboss.as" artifact="jboss-as-version"/>
+ </module-def>
+
<module-def name="org.jboss.as.web">
<maven-resource group="org.jboss.as" artifact="jboss-as-web"/>
<maven-resource group="org.jboss.web" artifact="jasper-jdt"/>
@@ -1098,7 +1102,7 @@
<module-def name="org.jboss.remoting-jmx">
<maven-resource group="org.jboss.remotingjmx" artifact="remoting-jmx"/>
- </module-def>
+ </module-def>
<module-def name="org.jboss.resteasy.resteasy-atom-provider">
<maven-resource group="org.jboss.resteasy" artifact="resteasy-atom-provider" jandex="true"/>
View
5 build/pom.xml
@@ -1069,6 +1069,11 @@
<dependency>
<groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-version</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.as</groupId>
<artifactId>jboss-as-web</artifactId>
</dependency>
View
1 build/src/main/resources/modules/org/jboss/as/appclient/main/module.xml
@@ -63,6 +63,7 @@
<module name="org.jboss.as.protocol"/>
<module name="org.jboss.as.remoting"/>
<module name="org.jboss.as.security"/>
+ <module name="org.jboss.as.version"/>
<module name="org.picketbox"/>
<module name="org.jboss.metadata"/>
</dependencies>
View
1 build/src/main/resources/modules/org/jboss/as/host-controller/main/module.xml
@@ -50,6 +50,7 @@
<module name="org.jboss.as.security" optional="true" services="import"/>
<module name="org.jboss.as.server"/>
<module name="org.jboss.as.threads"/>
+ <module name="org.jboss.as.version"/>
<module name="org.jboss.logging"/>
<module name="org.jboss.logmanager" services="import"/>
<module name="org.jboss.marshalling"/>
View
8 build/src/main/resources/modules/org/jboss/as/jsr77/main/module.xml
@@ -40,14 +40,14 @@
<module name="org.jboss.as.ejb3"/>
<module name="org.jboss.as.jmx"/>
<module name="org.jboss.as.naming"/>
- <module name="org.jboss.as.process-controller"/>
<module name="org.jboss.as.server"/>
+ <module name="org.jboss.as.version"/>
<module name="org.jboss.invocation"/>
<module name="org.jboss.msc"/>
<module name="org.jboss.logging"/>
- <module name="org.jboss.staxmapper"/>
-
+ <module name="org.jboss.staxmapper"/>
+
<!-- Only here temporarily -->
- <module name="org.jboss.ejb-client"/>
+ <module name="org.jboss.ejb-client"/>
</dependencies>
</module>
View
1 build/src/main/resources/modules/org/jboss/as/process-controller/main/module.xml
@@ -35,6 +35,7 @@
<dependencies>
<module name="javax.api"/>
+ <module name="org.jboss.as.version" export="true"/>
<module name="org.jboss.logging"/>
<module name="org.jboss.logmanager" services="import"/>
<module name="org.jboss.marshalling"/>
View
1 build/src/main/resources/modules/org/jboss/as/server/main/module.xml
@@ -64,6 +64,7 @@
<module name="org.jboss.as.protocol"/>
<module name="org.jboss.as.remoting"/>
<module name="org.jboss.as.security" optional="true" services="import"/>
+ <module name="org.jboss.as.version"/>
<module name="org.picketbox" optional="true"/>
</dependencies>
</module>
View
37 build/src/main/resources/modules/org/jboss/as/version/main/module.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2012, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<module xmlns="urn:jboss:module:1.1" name="org.jboss.as.version">
+ <properties>
+ <property name="jboss.api" value="private"/>
+ </properties>
+
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+
+ <dependencies>
+ <module name="org.jboss.modules"/>
+ </dependencies>
+</module>
View
6 host-controller/pom.xml
@@ -101,6 +101,10 @@
<artifactId>jboss-as-threads</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-version</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.logmanager</groupId>
<artifactId>jboss-logmanager</artifactId>
</dependency>
@@ -111,7 +115,7 @@
<dependency>
<groupId>org.jboss.remotingjmx</groupId>
<artifactId>remoting-jmx</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.jboss.marshalling</groupId>
<artifactId>jboss-marshalling-river</artifactId>
View
7 pom.xml
@@ -304,6 +304,7 @@
<module>server</module>
<module>subsystem-test</module>
<module>threads</module>
+ <module>version</module>
</modules>
<build>
@@ -1158,6 +1159,12 @@
<dependency>
<groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-version</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.as</groupId>
<artifactId>jboss-as-web</artifactId>
<version>${project.version}</version>
<exclusions>
View
8 process-controller/pom.xml
@@ -71,6 +71,10 @@
<dependencies>
<dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-version</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</dependency>
@@ -79,10 +83,6 @@
<artifactId>jboss-logmanager</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.modules</groupId>
- <artifactId>jboss-modules</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
<!-- This is a compile-time dependency of this project, but is not needed at compile or runtime by other
View
4 server/pom.xml
@@ -82,6 +82,10 @@
<artifactId>jboss-as-remoting</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-version</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss</groupId>
<artifactId>jandex</artifactId>
</dependency>
View
69 version/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2010, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-parent</artifactId>
+ <version>7.2.0.Alpha1-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-version</artifactId>
+ <version>7.2.0.Alpha1-SNAPSHOT</version>
+
+ <name>JBoss Application Server: Version</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <compilerArgument>
+ -AgeneratedTranslationFilesPath=${project.build.directory}/generated-translation-files
+ </compilerArgument>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.modules</groupId>
+ <artifactId>jboss-modules</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
View
0 ...a/org/jboss/as/version/ProductConfig.java → ...a/org/jboss/as/version/ProductConfig.java
File renamed without changes.
View
0 ...in/java/org/jboss/as/version/Version.java → ...in/java/org/jboss/as/version/Version.java
File renamed without changes.

0 comments on commit 55d615c

Please sign in to comment.