Revision: a8862f6bef36
Author: Alexandre Mendonça <ammendonca>
Date: Sun Jul 15 19:08:11 2012
Log: POM fixes
http://code.google.com/p/jdiameter/source/detail?r=a8862f6bef36&repo=rhq-plugin
Added:
/docs/jdocbook-telscale/pom.xml
/docs/sources-telscale/pom.xml
Deleted:
/docs/jdocbook-jbcp/pom.xml
/docs/sources-jbcp/pom.xml
Modified:
/docs/pom.xml
/pom.xml
=======================================
--- /dev/null
+++ /docs/jdocbook-telscale/pom.xml Sun Jul 15 19:08:11 2012
@@ -0,0 +1,98 @@
+
+<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">
+
+ <parent>
+ <groupId>org.mobicents.diameter.tools</groupId>
+ <artifactId>rhq-plugin-docs</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>rhq-plugin-docs-jdocbook-telscale</artifactId>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <packaging>jdocbook</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+
<phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+
<groupId>${pom.groupId}</groupId>
+
<artifactId>rhq-plugin-docs-sources-telscale</artifactId>
+
<version>${pom.version}</version>
+
<type>jar</type>
+
<overWrite>true</overWrite>
+
<outputDirectory>${project.build.directory}/docbook/resources</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.0</version>
+ <extensions>true</extensions>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss</groupId>
+
<artifactId>jbossorg-docbook-xslt</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+
<artifactId>jbossorg-jdocbook-style</artifactId>
+ <version>1.1.0</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ </dependencies>
+ <configuration>
+
<sourceDocumentName>User_Guide.xml</sourceDocumentName>
+
<sourceDirectory>${project.build.directory}/docbook/resources</sourceDirectory>
+ <imageResource>
+
<directory>${project.build.directory}/docbook/resources/en-US</directory>
+ <includes>
+
<include>images/*</include>
+ </includes>
+ </imageResource>
+ <formats>
+ <format>
+
<formatName>pdf</formatName>
+
<stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+
<finalName>User_Guide.pdf</finalName>
+ </format>
+ <format>
+
<formatName>html</formatName>
+
<stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
+
<finalName>index.html</finalName>
+ </format>
+ <format>
+
<formatName>html_single</formatName>
+
<stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
+
<finalName>index.html</finalName>
+ </format>
+ </formats>
+ <options>
+
<xincludeSupported>true</xincludeSupported>
+ <!-- needed for uri-resolvers; can be ommitted if using 'current'
uri scheme -->
+ <!-- could also locate the docbook dependency and inspect its
version... -->
+
<docbookVersion>1.72.0</docbookVersion>
+ </options>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
=======================================
--- /dev/null
+++ /docs/sources-telscale/pom.xml Sun Jul 15 19:08:11 2012
@@ -0,0 +1,77 @@
+
+<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.mobicents.diameter.tools</groupId>
+ <artifactId>rhq-plugin-docs</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>rhq-plugin-docs-sources-telscale</artifactId>
+
+ <properties>
+ <THIS.PLATFORM>JBoss Communications</THIS.PLATFORM>
+ <JEE.PLATFORM>JBoss Enterprise Application
Platform</JEE.PLATFORM>
+ <MANAGEMENT.PLATFORM>JBoss Operations
Network</MANAGEMENT.PLATFORM>
+
<THIS.PLATFORM.INSTALL_SECTION>Section-Install_TelScale.xml</THIS.PLATFORM.INSTALL_SECTION>
+
<author.email.alexandre>[email protected]</author.email.alexandre>
+ </properties>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+
<phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+
<groupId>${pom.groupId}</groupId>
+
<artifactId>rhq-plugin-docs-sources</artifactId>
+
<version>${pom.version}</version>
+
<type>jar</type>
+
<overWrite>true</overWrite>
+
<outputDirectory>${basedir}/src/main/resources</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>clean-resources</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <delete failonerror="false"
includeemptydirs="true">
+ <fileset
dir="${basedir}/src" />
+ </delete>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
=======================================
--- /docs/jdocbook-jbcp/pom.xml Sun Jul 15 15:53:18 2012
+++ /dev/null
@@ -1,98 +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/xsd/maven-4.0.0.xsd">
-
- <parent>
- <groupId>org.mobicents.diameter.tools</groupId>
- <artifactId>rhq-plugin-docs</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>rhq-plugin-docs-jdocbook-telscale</artifactId>
-
- <modelVersion>4.0.0</modelVersion>
-
- <packaging>jdocbook</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack</id>
-
<phase>generate-resources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
-
<groupId>${pom.groupId}</groupId>
-
<artifactId>rhq-plugin-docs-sources-telscale</artifactId>
-
<version>${pom.version}</version>
-
<type>jar</type>
-
<overWrite>true</overWrite>
-
<outputDirectory>${project.build.directory}/docbook/resources</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.2.0</version>
- <extensions>true</extensions>
- <dependencies>
- <dependency>
- <groupId>org.jboss</groupId>
-
<artifactId>jbossorg-docbook-xslt</artifactId>
- <version>1.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
-
<artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.1.0</version>
- <type>jdocbook-style</type>
- </dependency>
- </dependencies>
- <configuration>
-
<sourceDocumentName>User_Guide.xml</sourceDocumentName>
-
<sourceDirectory>${project.build.directory}/docbook/resources</sourceDirectory>
- <imageResource>
-
<directory>${project.build.directory}/docbook/resources/en-US</directory>
- <includes>
-
<include>images/*</include>
- </includes>
- </imageResource>
- <formats>
- <format>
-
<formatName>pdf</formatName>
-
<stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
-
<finalName>User_Guide.pdf</finalName>
- </format>
- <format>
-
<formatName>html</formatName>
-
<stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
-
<finalName>index.html</finalName>
- </format>
- <format>
-
<formatName>html_single</formatName>
-
<stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
-
<finalName>index.html</finalName>
- </format>
- </formats>
- <options>
-
<xincludeSupported>true</xincludeSupported>
- <!-- needed for uri-resolvers; can be ommitted if using 'current'
uri scheme -->
- <!-- could also locate the docbook dependency and inspect its
version... -->
-
<docbookVersion>1.72.0</docbookVersion>
- </options>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
=======================================
--- /docs/sources-jbcp/pom.xml Sun Jul 15 15:53:18 2012
+++ /dev/null
@@ -1,77 +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/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.mobicents.diameter.tools</groupId>
- <artifactId>rhq-plugin-docs</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>rhq-plugin-docs-sources-telscale</artifactId>
-
- <properties>
- <THIS.PLATFORM>JBoss Communications</THIS.PLATFORM>
- <JEE.PLATFORM>JBoss Enterprise Application
Platform</JEE.PLATFORM>
- <MANAGEMENT.PLATFORM>JBoss Operations
Network</MANAGEMENT.PLATFORM>
-
<THIS.PLATFORM.INSTALL_SECTION>Section-Install_TelScale.xml</THIS.PLATFORM.INSTALL_SECTION>
-
<author.email.alexandre>[email protected]</author.email.alexandre>
- </properties>
-
- <build>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack</id>
-
<phase>generate-resources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
-
<groupId>${pom.groupId}</groupId>
-
<artifactId>mobicents-diameter-rhq-plugin-docs-sources</artifactId>
-
<version>${pom.version}</version>
-
<type>jar</type>
-
<overWrite>true</overWrite>
-
<outputDirectory>${basedir}/src/main/resources</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>clean-resources</id>
- <phase>clean</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <delete failonerror="false"
includeemptydirs="true">
- <fileset
dir="${basedir}/src" />
- </delete>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
=======================================
--- /docs/pom.xml Sun Jul 15 15:53:18 2012
+++ /docs/pom.xml Sun Jul 15 19:08:11 2012
@@ -4,9 +4,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.mobicents.diameter.tools</groupId>
- <artifactId>rhq-plugin</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <groupId>org.mobicents</groupId>
+ <artifactId>mobicents-parent</artifactId>
+ <version>2.23-SNAPSHOT</version>
</parent>
<groupId>org.mobicents.diameter.tools</groupId>
=======================================
--- /pom.xml Sun Jul 15 18:35:05 2012
+++ /pom.xml Sun Jul 15 19:08:11 2012
@@ -87,19 +87,22 @@
<scope>provided</scope><!-- by PC -->
</dependency>
<dependency>
+ <!-- Update to org.mobicents.diameter once version >
1.4.0.FINAL -->
<groupId>org.mobicents.servers.diameter</groupId>
<artifactId>mobicents-diameter-mux-jar</artifactId>
<version>${mobicents.diameter.version}</version>
</dependency>
<dependency>
+ <!-- Update to org.mobicents.diameter once version >
1.4.0.FINAL -->
<groupId>org.mobicents.servers.diameter</groupId>
<artifactId>jdiameter-api</artifactId>
- <version>${mobicents.jdiameter.version}</version>
+ <version>${mobicents.jdiameter.version}</version>
</dependency>
<dependency>
+ <!-- Update to org.mobicents.diameter once version >
1.4.0.FINAL -->
<groupId>org.mobicents.servers.diameter</groupId>
<artifactId>jdiameter-impl</artifactId>
- <version>${mobicents.jdiameter.version}</version>
+ <version>${mobicents.jdiameter.version}</version>
</dependency>
<dependency>
<groupId>gnu-getopt</groupId>
@@ -237,10 +240,9 @@
</profile>
<profile>
<id>maven-release</id>
- <modules />
- <!--modules>
+ <modules>
<module>docs</module>
- </modules-->
+ </modules>
<build>
<plugins>
<plugin>