[jboss-cvs] JBossAS SVN: r87868 - in projects/aop/trunk/aop/docs: examples/method-execution and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Apr 27 10:56:46 EDT 2009
Author: stalep
Date: 2009-04-27 10:56:46 -0400 (Mon, 27 Apr 2009)
New Revision: 87868
Added:
projects/aop/trunk/aop/docs/pom.xml
projects/aop/trunk/aop/docs/reference/quickref/pom.xml
projects/aop/trunk/aop/docs/reference/reference/pom.xml
projects/aop/trunk/aop/docs/reference/userguide/pom.xml
Removed:
projects/aop/trunk/aop/docs/reference/README
projects/aop/trunk/aop/docs/reference/aopuserguide/
projects/aop/trunk/aop/docs/reference/build.xml
Modified:
projects/aop/trunk/aop/docs/examples/method-execution/MethodInterceptor.java
projects/aop/trunk/aop/docs/examples/method-execution/pom.xml
projects/aop/trunk/aop/docs/reference/reference/en/modules/installing.xml
Log:
[JBAOP-686]
changed to use maven docbook plugin instead of ant
Modified: projects/aop/trunk/aop/docs/examples/method-execution/MethodInterceptor.java
===================================================================
--- projects/aop/trunk/aop/docs/examples/method-execution/MethodInterceptor.java 2009-04-27 14:54:31 UTC (rev 87867)
+++ projects/aop/trunk/aop/docs/examples/method-execution/MethodInterceptor.java 2009-04-27 14:56:46 UTC (rev 87868)
@@ -22,6 +22,7 @@
import org.jboss.aop.joinpoint.Invocation;
import org.jboss.aop.joinpoint.MethodInvocation;
import org.jboss.aop.advice.Interceptor;
+import java.rmi.MarshalledObject;
/**
*
@@ -37,6 +38,8 @@
try
{
MethodInvocation mi = (MethodInvocation)invocation;
+ invocation.getMetaData().addMetaData("TEST", "TEST", "TEST");
+ Invocation copy = (Invocation) new MarshalledObject(invocation).get();
System.out.println("<<< Entering MethodInterceptor for: " + mi.getMethod().toString());
return invocation.invokeNext();
}
Modified: projects/aop/trunk/aop/docs/examples/method-execution/pom.xml
===================================================================
--- projects/aop/trunk/aop/docs/examples/method-execution/pom.xml 2009-04-27 14:54:31 UTC (rev 87867)
+++ projects/aop/trunk/aop/docs/examples/method-execution/pom.xml 2009-04-27 14:56:46 UTC (rev 87868)
@@ -32,8 +32,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>${jdkVersion}</source>
- <target>${jdkVersion}</target>
+ <source>1.6</source>
+ <target>1.6</target>
<excludes>
<exclude>target/*</exclude>
</excludes>
Added: projects/aop/trunk/aop/docs/pom.xml
===================================================================
--- projects/aop/trunk/aop/docs/pom.xml (rev 0)
+++ projects/aop/trunk/aop/docs/pom.xml 2009-04-27 14:56:46 UTC (rev 87868)
@@ -0,0 +1,20 @@
+<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">
+ <parent>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-parent</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.aop.docs</groupId>
+ <artifactId>jboss-aop-docs</artifactId>
+ <packaging>pom</packaging>
+ <name>JBoss AOP Docs</name>
+ <url>http://www.jboss.org/jbossaop</url>
+ <description>JBoss AOP Documentation</description>
+ <modules>
+ <module>reference/reference</module>
+ <module>reference/userguide</module>
+ <module>reference/quickref</module>
+ </modules>
+
+</project>
Deleted: projects/aop/trunk/aop/docs/reference/README
===================================================================
(Binary files differ)
Deleted: projects/aop/trunk/aop/docs/reference/build.xml
===================================================================
--- projects/aop/trunk/aop/docs/reference/build.xml 2009-04-27 14:54:31 UTC (rev 87867)
+++ projects/aop/trunk/aop/docs/reference/build.xml 2009-04-27 14:56:46 UTC (rev 87868)
@@ -1,189 +0,0 @@
-<project name="AOPDocumentation" default="all.doc" basedir=".">
-
- <!-- Set build directories for all formats. -->
- <property name="build.dir" value="${basedir}/build"/>
-
- <!-- Support files for build process. -->
- <property name="docbook.dir" value="../../../docbook-support"/>
- <property name="support.dir" value="${docbook.dir}/support"/>
- <property name="styles.dir" value="${docbook.dir}/styles"/>
-
- <!-- Set DocBook stylesheets. -->
- <property name="db.style.fopdf" value="fopdf.xsl"/>
- <property name="db.style.html" value="html_chunk.xsl"/>
- <property name="db.style.htmlsingle" value="html.xsl"/>
-
- <!-- Classpath for the build tools. -->
- <path id="lib.classpath">
- <fileset dir="${support.dir}/lib">
- <include name="**/*.jar"/>
- </fileset>
- </path>
-
- <!-- ################################################################## -->
-
- <target name="all.doc"
- depends="clean"
- description="Compile documentation for all languages and all formats.">
-
- <!-- TRANSLATOR: Duplicate this line for your language/book -->
- <antcall target="lang.all">
- <param name="lang" value="en"/>
- <param name="book" value="quickref"/>
- </antcall>
-
- <antcall target="lang.all">
- <param name="lang" value="en"/>
- <param name="book" value="reference"/>
- </antcall>
-
- <antcall target="lang.all">
- <param name="lang" value="en"/>
- <param name="book" value="userguide"/>
- </antcall>
-
- </target>
-
- <target name="all.revdiff"
- description="Generates a diff report for all translated versions.">
-
- <!-- TRANSLATOR: Duplicate this line for your language -->
- <antcall target="lang.revdiff" inheritRefs="true">
- <param name="lang" value="de"/>
- </antcall>
-
- </target>
-
- <!-- ################################################################## -->
-
- <target name="clean">
-
- <!-- Delete build directory. -->
- <delete dir="${build.dir}"/>
-
- </target>
-
- <target name="lang.all">
- <!-- Compile the documentation for a single language in all formats. -->
- <antcall target="lang.docpdf" inheritRefs="true"/>
- <antcall target="lang.dochtml" inheritRefs="true"/>
- <antcall target="lang.dochtmlsingle" inheritRefs="true"/>
- <antcall target="lang.htmlmisc" inheritRefs="true"/>
- </target>
-
-
- <target name="lang.docpdf.prepare">
-
- <!-- Copy all the images to the output location, will be removed later. -->
- <copy todir="${build.dir}/${book}/${lang}/pdf/images">
- <fileset dir="${basedir}/${book}/${lang}/images">
- <include name="**/*.png"/>
- <include name="**/*.svg"/>
- <include name="**/*.gif"/>
- <include name="**/*.jpg"/>
- </fileset>
- </copy>
-
- <!-- Create the XSL/FO temporary file. -->
- <java classname="com.icl.saxon.StyleSheet" fork="true" dir="${basedir}">
- <classpath refid="lib.classpath"/>
- <arg value="-o"/>
- <arg value="${build.dir}/${book}/${lang}/pdf/docbook_fop.tmp"/>
- <arg value="${basedir}/${book}/${lang}/master.xml"/>
- <arg value="${styles.dir}/${lang}/${db.style.fopdf}"/>
- </java>
-
- <available property="custom.fop.userconfig.present" file="userconfig.xml" filepath="${basedir}/${book}/${lang}/fop"/>
- </target>
-
- <target name="lang.docpdf.customized" depends="lang.docpdf.prepare" if="custom.fop.userconfig.present">
-
- <copy todir="${build.dir}/${book}/${lang}/pdf">
- <fileset dir="${basedir}/${book}/${lang}/fop">
- <include name="*"/>
- </fileset>
- </copy>
-
- <!-- Create a PDF from the XSL/FO, using customized fop userconfig.xml -->
- <java classname="org.apache.fop.apps.Fop" fork="true" dir="${basedir}">
- <classpath refid="lib.classpath"/>
- <arg value="-c"/>
- <arg value="${basedir}/${book}/${lang}/fop/userconfig.xml"/>
- <arg value="${build.dir}/${book}/${lang}/pdf/docbook_fop.tmp"/>
- <arg value="${build.dir}/${book}/${lang}/pdf/jbossaop_${book}.pdf"/>
- </java>
- </target>
-
- <target name="lang.docpdf.normal" depends="lang.docpdf.prepare" unless="custom.fop.userconfig.present">
- <!-- Create a PDF from the XSL/FO. -->
- <java classname="org.apache.fop.apps.Fop" fork="true" dir="${basedir}">
- <classpath refid="lib.classpath"/>
- <arg value="${build.dir}/${book}/${lang}/pdf/docbook_fop.tmp"/>
- <arg value="${build.dir}/${book}/${lang}/pdf/jbossaop_${book}.pdf"/>
- </java>
- </target>
-
- <target name="lang.docpdf" depends="lang.docpdf.normal,lang.docpdf.customized">
- <!-- House keeping,delete temporary files. -->
- <delete>
- <fileset dir="${build.dir}/${book}/${lang}/pdf" excludes="**/*.pdf"/>
- </delete>
- <delete dir="${build.dir}/${book}/${lang}/pdf/images"/>
- </target>
-
- <target name="lang.dochtml">
-
- <mkdir dir="${build.dir}/${book}/${lang}/html/"/>
- <java classname="com.icl.saxon.StyleSheet" fork="true" dir="${build.dir}/${book}/${lang}/html">
- <classpath refid="lib.classpath"/>
- <arg value="${basedir}/${book}/${lang}/master.xml"/>
- <arg value="${basedir}/${styles.dir}/${lang}/${db.style.html}"/>
- </java>
- </target>
-
- <target name="lang.dochtmlsingle">
-
- <mkdir dir="${build.dir}/${book}/${lang}/html_single/"/>
- <java classname="com.icl.saxon.StyleSheet" fork="true" dir="${basedir}">
- <classpath refid="lib.classpath"/>
- <arg value="-o"/>
- <arg value="${build.dir}/${book}/${lang}/html_single/index.html"/>
- <arg value="${basedir}/${book}/${lang}/master.xml"/>
- <arg value="${styles.dir}/${lang}/${db.style.htmlsingle}"/>
- </java>
- </target>
-
- <target name="lang.htmlmisc">
-
- <!-- Copy images and CSS for HTML documentation, language specific. -->
- <copy todir="${build.dir}/${book}/${lang}/shared/images">
- <fileset dir="${basedir}/${book}/${lang}/images">
- <include name="**/*.png"/>
- <include name="**/*.gif"/>
- <include name="**/*.jpg"/>
- </fileset>
- </copy>
- <copy todir="${build.dir}/${book}/${lang}/shared/css">
- <fileset dir="${styles.dir}/${lang}">
- <include name="**/*.css"/>
- </fileset>
- </copy>
-
- </target>
-
- <target name="lang.revdiff">
-
- <taskdef name="revdiff"
- classname="org.hibernate.docproc.revdiff.RevDiffReportTask"
- classpathref="lib.classpath">
-
- </taskdef>
-
- <revdiff original="${basedir}/${book}/en/master.xml"
- copy="${basedir}/${book}/${lang}/master.xml"
- report="${build.dir}/${book}/status_${lang}.html"/>
-
- </target>
-
-
-</project>
Added: projects/aop/trunk/aop/docs/reference/quickref/pom.xml
===================================================================
--- projects/aop/trunk/aop/docs/reference/quickref/pom.xml (rev 0)
+++ projects/aop/trunk/aop/docs/reference/quickref/pom.xml 2009-04-27 14:56:46 UTC (rev 87868)
@@ -0,0 +1,24 @@
+<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</groupId>
+ <artifactId>documentation</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <groupId>org.jboss.aop.docs</groupId>
+ <artifactId>jboss-aop-quickref-${translation}</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ <packaging>jdocbook</packaging>
+ <name>jbossaop_quickref</name>
+
+ <properties>
+ <translation>en</translation>
+ </properties>
+
+
+</project>
Modified: projects/aop/trunk/aop/docs/reference/reference/en/modules/installing.xml
===================================================================
--- projects/aop/trunk/aop/docs/reference/reference/en/modules/installing.xml 2009-04-27 14:54:31 UTC (rev 87867)
+++ projects/aop/trunk/aop/docs/reference/reference/en/modules/installing.xml 2009-04-27 14:56:46 UTC (rev 87868)
@@ -7,8 +7,8 @@
</para>
<mediaobject>
- <imageobject role="fo">
- <imagedata fileref="images/install.svg" format="SVG" align="center"/>
+ <imageobject>
+ <imagedata align="center" fileref="images/install.jpg"/>
</imageobject>
<imageobject role="html">
<imagedata fileref="../shared/images/install.jpg" format="JPG" align="center"/>
Added: projects/aop/trunk/aop/docs/reference/reference/pom.xml
===================================================================
--- projects/aop/trunk/aop/docs/reference/reference/pom.xml (rev 0)
+++ projects/aop/trunk/aop/docs/reference/reference/pom.xml 2009-04-27 14:56:46 UTC (rev 87868)
@@ -0,0 +1,24 @@
+<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</groupId>
+ <artifactId>documentation</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <groupId>org.jboss.aop.docs</groupId>
+ <artifactId>jboss-aop-reference-${translation}</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ <packaging>jdocbook</packaging>
+ <name>jbossaop_reference</name>
+
+ <properties>
+ <translation>en</translation>
+ </properties>
+
+
+</project>
Added: projects/aop/trunk/aop/docs/reference/userguide/pom.xml
===================================================================
--- projects/aop/trunk/aop/docs/reference/userguide/pom.xml (rev 0)
+++ projects/aop/trunk/aop/docs/reference/userguide/pom.xml 2009-04-27 14:56:46 UTC (rev 87868)
@@ -0,0 +1,24 @@
+<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</groupId>
+ <artifactId>documentation</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <groupId>org.jboss.aop.docs</groupId>
+ <artifactId>jboss-aop-userguide-${translation}</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ <packaging>jdocbook</packaging>
+ <name>jbossaop_userguide</name>
+
+ <properties>
+ <translation>en</translation>
+ </properties>
+
+
+</project>
More information about the jboss-cvs-commits
mailing list