Skip to content

Commit

Permalink
Miscellaneous changes
Browse files Browse the repository at this point in the history 
- Embeds jPOS-EE version as a property in archetype.
- Restructures document toolkit for better handling of future versioning.
- Added Distribution Management to main POM
  • Loading branch information
@vsalaman
vsalaman committed Jun 30, 2012
1 parent 55bec3f commit f16ecb3
Show file tree
Hide file tree
Showing 10 changed files with 254 additions and 194 deletions.
Empty file removed README
View file
Empty file.
3 changes: 3 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# jPOS Extended Edition

A framework for building enterprise grade jPOS application whilst fostering code reuse.
46 changes: 38 additions & 8 deletions archetype/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,32 +23,62 @@

<modelVersion>4.0.0</modelVersion>

<groupId>org.jpos.ee</groupId>
<parent>
<groupId>org.jpos.ee</groupId>
<artifactId>jposee-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

<artifactId>jposee-quickstart-archetype</artifactId>
<version>1.0</version>
<packaging>maven-archetype</packaging>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<build>

<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>archetype-resources/pom.xml</include>
</includes>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
<excludes>
<exclude>archetype-resources/pom.xml</exclude>
</excludes>
</resource>
</resources>

<extensions>
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
<version>2.1</version>
<version>2.2</version>
</extension>
</extensions>

<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-archetype-plugin</artifactId>
<version>2.1</version>
<version>2.2</version>
</plugin>
</plugins>
</pluginManagement>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.5</version>
<configuration>
<escapeString>\</escapeString>
</configuration>
</plugin>
</plugins>

</build>

</project>
38 changes: 21 additions & 17 deletions archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,25 @@
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->

<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="jposee-testbed"
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<fileSets>
<fileSet filtered="true" encoding="UTF-8">
<directory>src/main/java</directory>
<includes>
<include>**</include>
</includes>
</fileSet>
<fileSet filtered="true" encoding="UTF-8">
<directory>src/main/resources</directory>
<includes>
<include>**</include>
</includes>
</fileSet>
</fileSets>
<archetype-descriptor
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"
name="jposee-testbed"
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

<fileSets>
<fileSet filtered="true" encoding="UTF-8">
<directory>src/main/java</directory>
<includes>
<include>**</include>
</includes>
</fileSet>
<fileSet filtered="true" encoding="UTF-8">
<directory>src/main/resources</directory>
<includes>
<include>**</include>
</includes>
</fileSet>
</fileSets>

</archetype-descriptor>
30 changes: 15 additions & 15 deletions archetype/src/main/resources/archetype-resources/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
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>

<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
<version>${version}</version>
<groupId>\${groupId}</groupId>
<artifactId>\${artifactId}</artifactId>
<version>\${version}</version>

<name>jPOS-EE :: Quickstart</name>

<properties>
<runtime.dir>${project.basedir}/runtime</runtime.dir>
<jposee.version>2.0.0-SNAPSHOT</jposee.version>
<runtime.dir>\${project.basedir}/runtime</runtime.dir>
<jposee.version>${project.version}</jposee.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

Expand All @@ -38,13 +38,13 @@
<dependency>
<groupId>org.jpos.ee</groupId>
<artifactId>jposee-core</artifactId>
<version>${jposee.version}</version>
<version>\${jposee.version}</version>
</dependency>

<dependency>
<groupId>org.jpos.ee</groupId>
<artifactId>jposee-txn</artifactId>
<version>${jposee.version}</version>
<version>\${jposee.version}</version>
</dependency>

<!--
Expand All @@ -53,7 +53,7 @@
<dependency>
<groupId>org.jpos.ee</groupId>
<artifactId>jposee-db-h2</artifactId>
<version>${jposee.version}</version>
<version>\${jposee.version}</version>
</dependency>

</dependencies>
Expand Down Expand Up @@ -94,7 +94,7 @@
<configuration>
<filesets>
<fileset>
<directory>${runtime.dir}</directory>
<directory>\${runtime.dir}</directory>
<includes>
<include>lib/</include>
</includes>
Expand All @@ -120,15 +120,15 @@
<goal>copy</goal>
</goals>
<configuration>
<outputDirectory>${runtime.dir}</outputDirectory>
<outputDirectory>\${runtime.dir}</outputDirectory>
<stripVersion>true</stripVersion>
<!--suppress MavenModelInspection -->
<artifactItems>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<type>${project.packaging}</type>
<groupId>\${project.groupId}</groupId>
<artifactId>\${project.artifactId}</artifactId>
<version>\${project.version}</version>
<type>\${project.packaging}</type>
<destFileName>q2.jar</destFileName>
</artifactItem>
</artifactItems>
Expand All @@ -142,7 +142,7 @@
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${runtime.dir}/lib</outputDirectory>
<outputDirectory>\${runtime.dir}/lib</outputDirectory>
</configuration>
</execution>
</executions>
Expand Down
153 changes: 153 additions & 0 deletions doc/doc-parent/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>

<groupId>org.jpos.ee</groupId>
<artifactId>doc-parent</artifactId>
<version>1.0.0</version>
<packaging>pom</packaging>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<pluginRepositories>
<pluginRepository>
<id>sonatype-public</id>
<name>Sonatype Public</name>
<url>http://repository.sonatype.org/content/groups/public</url>
</pluginRepository>
</pluginRepositories>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.5</version>
<executions>
<execution>
<id>copy-images</id>
<phase>process-sources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/docbkx/source/images</outputDirectory>
<resources>
<resource>
<directory>${project.basedir}/src/asciidoc/images</directory>
<filtering>false</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.4</version>
<executions>
<execution>
<id>unpack</id>
<phase>package</phase>
<goals>
<!--suppress MavenModelInspection -->
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.jpos.ee</groupId>
<artifactId>doc-docbkx-stylesheet</artifactId>
<version>${project.version}</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/docbkx/source/docbkx-stylesheet</outputDirectory>
<includes>**/*.xsl</includes>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.1</version>
<executions>
<execution>
<id>asciidoc-to-docbook</id>
<phase>process-sources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>asciidoc</executable>
<arguments>
<argument>--attribute</argument>
<argument>docinfo</argument>
<argument>--doctype</argument>
<argument>book</argument>
<argument>--backend</argument>
<argument>docbook</argument>
<argument>--out-file</argument>
<argument>${project.build.directory}/docbkx/source/book.xml</argument>
<argument>book.asc</argument>
</arguments>
<workingDirectory>${project.basedir}/src/asciidoc</workingDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.agilejava.docbkx</groupId>
<artifactId>docbkx-maven-plugin</artifactId>
<version>2.0.14</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>generate-pdf</goal>
</goals>
<configuration>
<includes>book.xml</includes>
<draftMode>no</draftMode>
<sourceDirectory>${project.build.directory}/docbkx/source</sourceDirectory>
<generatedSourceDirectory>${project.build.directory}/docbkx/generated</generatedSourceDirectory>
<targetDirectory>${project.build.directory}/doc/pdf</targetDirectory>
<xincludeSupported>false</xincludeSupported>
<paperType>A4</paperType>
<fop1Extensions>1</fop1Extensions>
<highlightSource>1</highlightSource>
<admonGraphics>1</admonGraphics>
<calloutGraphics>1</calloutGraphics>
<!--suppress MavenModelInspection -->
<foCustomization>${project.build.directory}/docbkx/source/docbkx-stylesheet/fo.xsl</foCustomization>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>docbook</groupId>
<artifactId>docbook-xml</artifactId>
<version>4.5</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>net.sf.xslthl</groupId>
<artifactId>xslthl</artifactId>
<version>2.0.2</version>
<scope>runtime</scope>
</dependency>
</dependencies>
</plugin>
</plugins>
</pluginManagement>
</build>

</project>
6 changes: 3 additions & 3 deletions doc/docbkx-stylesheet/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

<parent>
<groupId>org.jpos.ee</groupId>
<artifactId>doc-base</artifactId>
<version>2.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
<artifactId>doc-parent</artifactId>
<version>1.0.0</version>
<relativePath>../doc-parent</relativePath>
</parent>

<artifactId>doc-docbkx-stylesheet</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions doc/en/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

<parent>
<groupId>org.jpos.ee</groupId>
<artifactId>doc-base</artifactId>
<version>2.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
<artifactId>doc-parent</artifactId>
<version>1.0.0</version>
<relativePath>../doc-parent</relativePath>
</parent>

<artifactId>jpos-ee-en</artifactId>
Expand Down
Loading

0 comments on commit f16ecb3

Please sign in to comment.