[jboss-svn-commits] JBL Code SVN: r8807 - in labs/jbosslabs/trunk/portal-extensions-2.6: binaries/maven-repo-addons/jboss/jars and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jan 10 16:44:27 EST 2007
Author: adamw
Date: 2007-01-10 16:43:35 -0500 (Wed, 10 Jan 2007)
New Revision: 8807
Added:
labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/bsh-1.3.0.jar
labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/concurrent.jar
labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/javassist.jar
labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/jboss-aop-jdk50-client.jar
labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/jboss-aspect-jdk50-client.jar
labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/jboss-aspect-library-jdk50.jar
labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/qdox.jar
labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/trove.jar
Removed:
labs/jbosslabs/trunk/portal-extensions-2.6/forge-timetracker/
labs/jbosslabs/trunk/portal-extensions-2.6/forge-wiki/
Modified:
labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/jboss-aop-jdk50.jar
labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/jboss-common.jar
labs/jbosslabs/trunk/portal-extensions-2.6/common.xml
labs/jbosslabs/trunk/portal-extensions-2.6/configuration/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/META-INF/jboss-service.xml
labs/jbosslabs/trunk/portal-extensions-2.6/maven.xml
Log:
Build change to AOP compile-time
Added: labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/bsh-1.3.0.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/bsh-1.3.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/concurrent.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/concurrent.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/javassist.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/javassist.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/jboss-aop-jdk50-client.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/jboss-aop-jdk50-client.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/jboss-aop-jdk50.jar
===================================================================
(Binary files differ)
Added: labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/jboss-aspect-jdk50-client.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/jboss-aspect-jdk50-client.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/jboss-aspect-library-jdk50.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/jboss-aspect-library-jdk50.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/jboss-common.jar
===================================================================
(Binary files differ)
Added: labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/qdox.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/qdox.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/trove.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions-2.6/binaries/maven-repo-addons/jboss/jars/trove.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/common.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/common.xml 2007-01-10 21:18:50 UTC (rev 8806)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/common.xml 2007-01-10 21:43:35 UTC (rev 8807)
@@ -3,79 +3,79 @@
<pomVersion>3</pomVersion>
<dependencies>
- <dependency>
- <id>portlet-api</id>
- <version>1.0</version>
- </dependency>
-
- <dependency>
+ <dependency>
+ <id>portlet-api</id>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
<groupId>jboss</groupId>
<artifactId>jboss-jmx</artifactId>
<version>1.0</version>
<jar>jboss-jmx.jar</jar>
</dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common</artifactId>
- <version>1.0</version>
- <jar>jboss-common.jar</jar>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>portal-common-lib</artifactId>
- <version>1.0</version>
- <jar>portal-common-lib.jar</jar>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>portal-identity-lib</artifactId>
- <version>1.0</version>
- <jar>portal-identity-lib.jar</jar>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>portal-core-lib</artifactId>
- <version>1.0</version>
- <jar>portal-core-lib.jar</jar>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-portlet-api-lib</artifactId>
- <version>1.0</version>
- <jar>jboss-portlet-api-lib.jar</jar>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>portal-api-lib</artifactId>
- <version>1.0</version>
- <jar>portal-api-lib.jar</jar>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>portal-portlet-lib</artifactId>
- <version>1.0</version>
- <jar>portal-portlet-lib.jar</jar>
- </dependency>
-
- <dependency>
- <groupId>shotoku</groupId>
- <artifactId>shotoku-base</artifactId>
- <version>1.0</version>
- <jar>shotoku-base.jar</jar>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common</artifactId>
+ <version>1.0</version>
+ <jar>jboss-common.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>portal-common-lib</artifactId>
+ <version>1.0</version>
+ <jar>portal-common-lib.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>portal-identity-lib</artifactId>
+ <version>1.0</version>
+ <jar>portal-identity-lib.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>portal-core-lib</artifactId>
+ <version>1.0</version>
+ <jar>portal-core-lib.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-portlet-api-lib</artifactId>
+ <version>1.0</version>
+ <jar>jboss-portlet-api-lib.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>portal-api-lib</artifactId>
+ <version>1.0</version>
+ <jar>portal-api-lib.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>portal-portlet-lib</artifactId>
+ <version>1.0</version>
+ <jar>portal-portlet-lib.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>shotoku</groupId>
+ <artifactId>shotoku-base</artifactId>
+ <version>1.0</version>
+ <jar>shotoku-base.jar</jar>
<properties>
<ejb.manifest.classpath>true</ejb.manifest.classpath>
</properties>
- </dependency>
+ </dependency>
- <dependency>
- <groupId>shotoku</groupId>
- <artifactId>shotoku-aop</artifactId>
- <version>1.0</version>
- <jar>shotoku-aop.jar</jar>
- </dependency>
+ <dependency>
+ <groupId>shotoku</groupId>
+ <artifactId>shotoku-aop</artifactId>
+ <version>1.0</version>
+ <jar>shotoku-aop.jar</jar>
+ </dependency>
<dependency>
<groupId>velocity</groupId>
@@ -92,8 +92,34 @@
<artifactId>velocity</artifactId>
<version>1.4-dev</version>
</dependency>
+
+ <!-- AOP -->
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>javassist</artifactId>
+ <version>1.0</version>
+ <jar>javassist.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>trove</artifactId>
+ <version>1.0</version>
+ <jar>trove.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.0</version>
+ <jar>concurrent.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-aop-jdk50</artifactId>
+ <version>1.0</version>
+ <jar>jboss-aop-jdk50.jar</jar>
+ </dependency>
</dependencies>
-
+
<build>
<sourceDirectory>src/java</sourceDirectory>
</build>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/configuration/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/META-INF/jboss-service.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/configuration/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/META-INF/jboss-service.xml 2007-01-10 21:18:50 UTC (rev 8806)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/configuration/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/META-INF/jboss-service.xml 2007-01-10 21:43:35 UTC (rev 8807)
@@ -21,7 +21,7 @@
-->
<mbean code="org.jboss.aop.deployment.AspectManagerServiceJDK5"
name="jboss.aop:service=AspectManager">
- <attribute name="EnableLoadtimeWeaving">true</attribute>
+ <attribute name="EnableLoadtimeWeaving">false</attribute>
<!-- only relevant when EnableLoadtimeWeaving is true.
When transformer is on, every loaded class gets
transformed. If AOP can't find the class, then it
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/maven.xml 2007-01-10 21:18:50 UTC (rev 8806)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/maven.xml 2007-01-10 21:43:35 UTC (rev 8807)
@@ -4,8 +4,8 @@
See terms of license at gnu.org.
-->
<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util" xmlns:maven="jelly:maven">
- <!--
- Project-build goals
+ <!--
+ Project-build goals
-->
<!-- Helper goal - should be called only from a project's build - copies the forge
@@ -14,11 +14,33 @@
<ant:copy todir="src/web/WEB-INF/tld" file="../forge-common/src/web/WEB-INF/tld/forge.tld" overwrite="true" />
</goal>
- <!-- Common goals that can be called from a project's build -->
+ <!-- AOP instrumentation -->
+ <goal name="aop-instrument">
+ <ant:taskdef name="aopc" classname="org.jboss.aop.ant.AopC">
+ <ant:classpath>
+ <ant:path refid="maven.dependency.classpath"/>
+ </ant:classpath>
+ </ant:taskdef>
+ <ant:aopc verbose="false">
+ <ant:src path="${maven.build.dest}" />
+ <ant:include name="**/*.class" />
+ <ant:aopclasspath path="../shotoku/shotoku-aop/target/shotoku-aop.jar" />
+ <ant:classpath>
+ <ant:path refid="maven.dependency.classpath"/>
+ <ant:pathelement location="${maven.build.dest}" />
+ </ant:classpath>
+ </ant:aopc>
+ </goal>
+
+ <postGoal name="java:compile">
+ <attainGoal name="aop-instrument" />
+ </postGoal>
+
+ <!-- Common goals that can be called from a project's build -->
<goal name="prj-war-build">
<attainGoal name="copy-tld" />
<attainGoal name="war" />
- </goal>
+ </goal>
<goal name="prj-war-deploy">
<ant:copy todir="../${forge.sar.dir}/target" flatten="true" overwrite="true">
@@ -27,7 +49,7 @@
</ant:fileset>
</ant:copy>
</goal>
-
+
<goal name="prj-jar-deploy">
<ant:copy todir="../${forge.sar.dir}/target" flatten="true" overwrite="true">
<ant:fileset dir=".">
@@ -35,7 +57,7 @@
</ant:fileset>
</ant:copy>
</goal>
-
+
<goal name="prj-clean">
<ant:delete dir="${maven.build.dir}"/>
<ant:delete dir="${maven.build.dest}"/>
@@ -43,7 +65,7 @@
<!-- A convenience goal that redeploys only one project -->
<goal name="prj-all">
- <attainGoal name="clean" />
+ <attainGoal name="clean" />
<attainGoal name="build" />
<attainGoal name="deploy" />
<ant:copy todir="${local.deploy.dir}" flatten="true" overwrite="true">
@@ -53,8 +75,8 @@
</ant:copy>
</goal>
- <!--
- Internal-use goals
+ <!--
+ Internal-use goals
-->
<!-- A goal that deploys the sar into the appserver -->
@@ -67,7 +89,7 @@
file="${forge.sar.dir}/src/META-INF/jboss-service.xml"
tofile="${forge.sar.dir}/target/${forge.sar.name}/META-INF/jboss-service.xml"
overwrite="true" />
-
+
<!-- Copying the dependency JARs -->
<ant:copy
todir="${forge.sar.dir}/target/${forge.sar.name}"
@@ -97,32 +119,32 @@
</ant:fileset>
</ant:copy>
</goal>
-
+
<!-- Copies necessary jars to the repository -->
<goal name="prepare-repo">
- <ant:copy todir="${maven.repo.local}" overwrite="true">
+ <ant:copy todir="${maven.repo.local}" overwrite="true">
<ant:fileset dir="binaries/maven-repo-addons" />
</ant:copy>
-
+
<ant:exec dir="${basedir}/shotoku" executable="maven">
<ant:arg line="all" />
</ant:exec>
-
- <maven:reactor includes="forge-common/project.xml" excludes="" basedir="."
- banner="Making forge-common for the repo"
+
+ <maven:reactor includes="forge-common/project.xml" excludes="" basedir="."
+ banner="Making forge-common for the repo"
goals="clean,jar" ignoreFailures="false" />
<ant:copy todir="${maven.repo.local}/jboss-forge/jars" overwrite="true">
<ant:fileset dir="forge-common/target">
<ant:include name="*.jar" />
- </ant:fileset>
+ </ant:fileset>
</ant:copy>
</goal>
-
+
<!-- Default project install goal - empty -->
<goal name="prj-install">
</goal>
-
- <!-- An "svn update" goal for cruise control use -->
+
+ <!-- An "svn update" goal for cruise control use -->
<goal name="update">
<attainGoal name="scm:update" />
</goal>
@@ -173,28 +195,28 @@
in jboss-forge.sar, for others, it may not work.
</echo>
</goal>
-
+
<goal name="install">
<echo>
Installing JBoss AS 4.0.4, EJB3 RC8, Portal 2.4 to the specified directory (${local.deploy.dir}).
</echo>
-
+
<attainGoal name="prepare-repo" />
<ant:copy todir="${local.server.dir}" overwrite="true">
<ant:fileset dir="jboss-as-binaries/to-copy" />
</ant:copy>
-
+
<ant:copy todir="${local.deploy.dir}" overwrite="true">
<ant:fileset dir="portal-binaries/to-copy" />
</ant:copy>
-
+
<j:set var="goal" value="prj-install" />
<attainGoal name="multiproject:goal" />
-
+
<echo>
JBoss AS w/ EJB3 and Portal are now installed.
-
+
The installation is by default configured to work with mysql.
To change this, do the follwing:
1. Delete ${local.deploy.dir}/portal-mysql-ds.xml
@@ -204,12 +226,12 @@
- ${local.deploy.dir}/portal-forums.sar/portal-forums.sar/conf/hibernate/hibernate.cfg.xml
- ${local.deploy.dir}/jboss-portal.sar/conf/hibernate/hibernate.cfg.xml.
to use an appropriate dialect.
-
+
Now you can run the build with "maven all", and later start the server with:
${local.server.dir}/bin/run.sh -c all.
</echo>
</goal>
-
+
<goal name="clean">
<ant:delete dir="${forge.sar.dir}/target" />
<j:set var="goal" value="clean" />
@@ -233,12 +255,12 @@
<goal name="all">
<ant:delete dir="${local.deploy.dir}/${forge.sar.name}" />
<ant:delete dir="${forge.sar.dir}/target" />
-
+
<attainGoal name="prepare-repo" />
-
+
<j:set var="goal" value="clean,build,deploy" />
<attainGoal name="multiproject:goal" />
-
+
<attainGoal name="deploy-sar" />
</goal>
</project>
More information about the jboss-svn-commits
mailing list