Skip to content

Commit

Permalink
fix docs build
Browse files Browse the repository at this point in the history 
Signed-off-by: Lukas Jungmann <[email protected]>
  • Loading branch information
@lukasj
lukasj committed Oct 20, 2023
1 parent 3476b2a commit f2c1d1e
Show file tree
Hide file tree
Showing 6 changed files with 114 additions and 141 deletions.
1 change: 0 additions & 1 deletion wsit/bundles/metro-standalone/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<executions>
<execution>
<id>instrument-shaded-jar</id>
Expand Down
90 changes: 30 additions & 60 deletions wsit/docs/getting-started/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,51 +28,53 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>process-entities</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<echo message="Preparing char entities"/>
<mkdir dir="${src.dir}"/>
<copy todir="${src.dir}">
<fileset dir="src/docbook"/>
<fileset dir="${project.basedir}/src/docbook" excludes="**/samples/**"/>
</copy>

<copy todir="${project.build.directory}/docbook/style">
<fileset dir="${src.dir}/style"/>
</copy>
<copy todir="${project.build.directory}/docbook/icons">
<fileset dir="${src.dir}/icons"/>
</copy>

<mkdir dir="${project.build.directory}/docbook/download"/>
<macrodef name="java-bundle">
<attribute name="name"/>
<sequential>
<zip destfile="${project.build.directory}/docbook/download/@{name}.zip"
basedir="${project.basedir}/src/docbook/samples/" includes="@{name}/**"/>
</sequential>
</macrodef>

<java-bundle name="csclient"/>
<java-bundle name="wsit-enabled-fromjava"/>
<java-bundle name="wsit-enabled-fromwsdl"/>
<java-bundle name="wsit-jaxws-fromjava" />
<java-bundle name="wsit-jaxws-fromwsdl" />
<java-bundle name="wsit-external-metadata" />
</target>
</configuration>
<id>process-entities</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.agilejava.docbkx</groupId>
<artifactId>docbkx-maven-plugin</artifactId>
<dependencies>
<dependency>
<groupId>net.sf.docbook</groupId>
<artifactId>docbook-xml</artifactId>
<version>5.0-all</version>
<type>zip</type>
<classifier>resources</classifier>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>net.sf.xslthl</groupId>
<artifactId>xslthl</artifactId>
<version>2.0.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>net.sf.offo</groupId>
<artifactId>fop-hyph</artifactId>
<version>1.2</version>
<scope>runtime</scope>
</dependency>
</dependencies>
<configuration>
<xincludeSupported>true</xincludeSupported>
<sourceDirectory>${src.dir}</sourceDirectory>
Expand All @@ -92,38 +94,6 @@
<highlightDefaultLanguage>true</highlightDefaultLanguage>
<htmlLongdesc>false</htmlLongdesc>
<keepRelativeImageUris>true</keepRelativeImageUris>

<preProcess>
<copy todir="${project.build.directory}/docbook/figures">
<fileset dir="${src.dir}/figures" />
</copy>
<copy todir="${project.build.directory}/docbook/style">
<fileset dir="${src.dir}/style" />
</copy>
<copy todir="${project.build.directory}/docbook/samples">
<fileset dir="${src.dir}/samples" />
</copy>
<copy todir="${project.build.directory}/docbook/icons">
<fileset dir="${src.dir}/icons" />
</copy>

<mkdir dir="${project.build.directory}/docbook/download" />

<macrodef name="java-bundle">
<attribute name="name"/>
<sequential>
<zip destfile="${project.build.directory}/docbook/download/@{name}.zip"
basedir="${project.build.directory}/docbook/samples/" includes="@{name}/**"/>
</sequential>
</macrodef>

<java-bundle name="csclient" />
<java-bundle name="wsit-enabled-fromjava" />
<java-bundle name="wsit-enabled-fromwsdl" />
<java-bundle name="wsit-jaxws-fromjava" />
<java-bundle name="wsit-jaxws-fromwsdl" />
<java-bundle name="wsit-external-metadata" />
</preProcess>
</configuration>
<executions>
<execution>
Expand Down
78 changes: 34 additions & 44 deletions wsit/docs/guide/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<artifactId>docs</artifactId>
<groupId>org.glassfish.metro</groupId>
<version>2.4.10-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>guide</artifactId>
Expand All @@ -29,55 +30,57 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>pre-process</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<echo message="Preparing char entities"/>
<mkdir dir="${src.dir}"/>
<copy todir="${src.dir}">
<fileset dir="src/docbook"/>
<fileset dir="${project.basedir}/src/docbook" excludes="**/download/**"/>
</copy>
<replace file="${src.dir}/metro.ent" token="$version" value="${project.version}"/>
<replace file="${src.dir}/metro.ent" token="$repository" value="${javanet.repository.id}"/>
<replace file="${src.dir}/metro.ent" token="$jax-ws.version" value="${www.guide.jaxws.version}"/>
<replace file="${src.dir}/metro.ent" token="$jaxws.home.uri" value="${www.guide.jaxws.home.uri}"/>

<copy todir="${project.build.directory}/docbook/figures">
<fileset dir="${src.dir}/figures" />
</copy>
<copy todir="${project.build.directory}/docbook/style">
<fileset dir="${src.dir}/style"/>
</copy>
<copy todir="${project.build.directory}/docbook/icons">
<fileset dir="${src.dir}/icons"/>
</copy>

<mkdir dir="${project.build.directory}/docbook/download"/>
<macrodef name="java-bundle">
<attribute name="name"/>
<sequential>
<zip destfile="${project.build.directory}/docbook/download/@{name}.zip"
basedir="${project.basedir}/src/docbook/download/" includes="@{name}/**"/>
</sequential>
</macrodef>

<java-bundle name="MetroMtomService"/>
<java-bundle name="portable-client-withwsdl"/>
<java-bundle name="WCFMtomClient"/>
</target>
</configuration>
<id>process-entities</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.agilejava.docbkx</groupId>
<artifactId>docbkx-maven-plugin</artifactId>
<dependencies>
<dependency>
<groupId>net.sf.docbook</groupId>
<artifactId>docbook-xml</artifactId>
<version>5.0-all</version>
<type>zip</type>
<classifier>resources</classifier>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>net.sf.xslthl</groupId>
<artifactId>xslthl</artifactId>
<version>2.0.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>net.sf.offo</groupId>
<artifactId>fop-hyph</artifactId>
<version>1.2</version>
<scope>runtime</scope>
</dependency>
</dependencies>
<configuration>
<xincludeSupported>true</xincludeSupported>
<sourceDirectory>${src.dir}</sourceDirectory>
Expand All @@ -96,22 +99,6 @@
<highlightDefaultLanguage>true</highlightDefaultLanguage>
<htmlLongdesc>false</htmlLongdesc>
<keepRelativeImageUris>true</keepRelativeImageUris>
<useStandardOutput>true</useStandardOutput>

<preProcess>
<copy todir="${project.build.directory}/docbook/figures">
<fileset dir="${src.dir}/figures" />
</copy>
<copy todir="${project.build.directory}/docbook/download">
<fileset dir="${src.dir}/download" />
</copy>
<copy todir="${project.build.directory}/docbook/style">
<fileset dir="${src.dir}/style" />
</copy>
<copy todir="${project.build.directory}/docbook/icons">
<fileset dir="${src.dir}/icons" />
</copy>
</preProcess>
</configuration>
<executions>
<execution>
Expand Down Expand Up @@ -152,6 +139,7 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
Expand All @@ -177,6 +165,7 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
Expand All @@ -201,6 +190,7 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
Expand Down
2 changes: 2 additions & 0 deletions wsit/docs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<artifactId>metro-project</artifactId>
<groupId>org.glassfish.metro</groupId>
<version>2.4.10-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>docs</artifactId>
Expand All @@ -38,6 +39,7 @@
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
Expand Down
17 changes: 7 additions & 10 deletions wsit/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,11 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>3.1.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>com.agilejava.docbkx</groupId>
<artifactId>docbkx-maven-plugin</artifactId>
Expand Down Expand Up @@ -365,7 +370,7 @@
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
</configuration>
<!-- <executions>
<executions>
<execution>
<id>base-compile</id>
<goals>
Expand All @@ -378,14 +383,11 @@
</excludes>
</configuration>
</execution>
</executions>-->
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>once</forkMode>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -596,11 +598,6 @@
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
Expand Down
Loading

0 comments on commit f2c1d1e

Please sign in to comment.