[jboss-svn-commits] JBL Code SVN: r26558 - in labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services: smooks and 10 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri May 15 08:32:58 EDT 2009
Author: kevin.conner at jboss.com
Date: 2009-05-15 08:32:58 -0400 (Fri, 15 May 2009)
New Revision: 26558
Added:
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/smooks/aop/
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/smooks/aop/java/
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/smooks/aop/java/org/
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/smooks/aop/java/org/jboss/
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/smooks/aop/java/org/jboss/internal/
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/smooks/aop/java/org/jboss/internal/soa/
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/smooks/aop/java/org/jboss/internal/soa/esb/
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/smooks/aop/java/org/jboss/internal/soa/esb/smooks/
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/smooks/aop/java/org/jboss/internal/soa/esb/smooks/ShutdownHookAspect.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/smooks/aop/resources/
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/smooks/aop/resources/META-INF/
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/smooks/aop/resources/META-INF/jboss-aop.xml
Modified:
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/base-project-build.xml
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/smooks/build.xml
Log:
Disable shutdown hook in smooks: JBESB-2520
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/base-project-build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/base-project-build.xml 2009-05-15 12:16:44 UTC (rev 26557)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/base-project-build.xml 2009-05-15 12:32:58 UTC (rev 26558)
@@ -12,6 +12,7 @@
-->
<dirname property="services.dir" file="${ant.file.base-build}"/>
<property name="esb.root.dir" location="../.."/>
+ <property name="lib.excludes" value=""/>
<target name="clean">
<delete dir="build" />
</target>
@@ -59,23 +60,35 @@
</condition>
</target>
- <target name="compile" depends="prepare">
+ <target name="compile" depends="base-compile, service-compile"/>
+
+ <target name="base-compile" depends="prepare">
<javac srcdir="src/main/java" destdir="build/classes" debug="on" >
<classpath refid="classpath" />
</javac>
</target>
+
+ <target name="service-compile"/>
- <target name="jar" depends="compile,check.for.files" unless="dir_empty">
+ <target name="jar" depends="base-jar, service-jar"/>
+
+ <target name="base-jar" depends="compile,check.for.files" unless="dir_empty">
<jar basedir="build/classes" destfile="build/jbossesb-${ant.project.name}.jar" includes="**/*.class"/>
</target>
- <target name="esb" depends="jar">
+ <target name="service-jar"/>
+
+ <target name="esb" depends="base-esb,service-esb"/>
+
+ <target name="base-esb" depends="jar">
<copy todir="build/${ant.project.name}.esb/" >
- <fileset dir="lib/ext" includes="*.jar"/>
+ <fileset dir="lib/ext" includes="*.jar" excludes="${lib.excludes}"/>
<fileset dir="src/main/resources/" includes="**/*"/>
<fileset dir="build" includes="*.jar"/>
</copy>
</target>
+
+ <target name="service-esb"/>
<target name="dist" depends="esb">
<!-- copying to jbossesb/lib -->
Added: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/smooks/aop/java/org/jboss/internal/soa/esb/smooks/ShutdownHookAspect.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/smooks/aop/java/org/jboss/internal/soa/esb/smooks/ShutdownHookAspect.java (rev 0)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/smooks/aop/java/org/jboss/internal/soa/esb/smooks/ShutdownHookAspect.java 2009-05-15 12:32:58 UTC (rev 26558)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.internal.soa.esb.smooks;
+
+import org.jboss.aop.joinpoint.Invocation;
+
+/**
+ * Aspect used to disable smooks shutdown hooks.
+ *
+ * @author <a href='mailto:Kevin.Conner at jboss.com'>Kevin Conner</a>
+ */
+public class ShutdownHookAspect
+{
+ public Object addShutdownHook(final Invocation invocation)
+ throws Throwable
+ {
+ return null ;
+ }
+
+ public Object removeShutdownHook(final Invocation invocation)
+ throws Throwable
+ {
+ return null ;
+ }
+}
Property changes on: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/smooks/aop/java/org/jboss/internal/soa/esb/smooks/ShutdownHookAspect.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native
Added: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/smooks/aop/resources/META-INF/jboss-aop.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/smooks/aop/resources/META-INF/jboss-aop.xml (rev 0)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/smooks/aop/resources/META-INF/jboss-aop.xml 2009-05-15 12:32:58 UTC (rev 26558)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE aop PUBLIC
+ "-//JBoss//DTD JBOSS AOP 1.0//EN"
+ "http://labs.jboss.com/portal/jbossaop/dtd/jboss-aop_1_0.dtd">
+
+<aop>
+ <aspect class="org.jboss.internal.soa.esb.smooks.ShutdownHookAspect" scope="PER_VM"/>
+
+ <bind pointcut="execution(private void org.milyn.cdr.SmooksResourceConfigurationStore->addShutdownHook())">
+ <advice name="addShutdownHook" aspect="org.jboss.internal.soa.esb.smooks.ShutdownHookAspect"/>
+ </bind>
+
+ <bind pointcut="execution(public void org.milyn.cdr.SmooksResourceConfigurationStore->removeShutdownHook())">
+ <advice name="removeShutdownHook" aspect="org.jboss.internal.soa.esb.smooks.ShutdownHookAspect"/>
+ </bind>
+</aop>
+
Property changes on: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/smooks/aop/resources/META-INF/jboss-aop.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/smooks/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/smooks/build.xml 2009-05-15 12:16:44 UTC (rev 26557)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/smooks/build.xml 2009-05-15 12:32:58 UTC (rev 26558)
@@ -1,9 +1,66 @@
<project name="smooks" default="test" basedir=".">
<property file="build.properties"/>
+
+ <property name="build.dir" location="build"/>
+ <property name="aop.dir" location="aop"/>
+ <property name="aop.src.dir" location="${aop.dir}/java"/>
+ <property name="aop.resources.dir" location="${aop.dir}/resources"/>
+
+ <property name="smooks.jar" value="milyn-smooks-core-1.0.1.jar"/>
+
+ <property name="aop.jar.version" value="1.0"/>
+ <property name="aop.jar.name" value="jboss-smooks-${aop.jar.version}.aop"/>
+ <property name="aop.jar" value="${build.dir}/${aop.jar.name}"/>
+ <property name="aop.classes.dir" location="${build.dir}/aop-classes"/>
+ <property name="aopc.classes.dir" location="${build.dir}/aopc-classes"/>
+
+ <property name="lib.excludes" value="${smooks.jar}"/>
+
<!-- Import the base Ant build script... -->
<import file="${services.base.build}"/>
<target name="test" depends="base.test"/>
+ <target name="service-compile" depends="prepare">
+ <delete dir="${aop.classes.dir}" quiet="true"/>
+ <mkdir dir="${aop.classes.dir}"/>
+
+ <javac srcdir="${aop.src.dir}" destdir="${aop.classes.dir}"
+ debug="true" source="1.5" classpathref="classpath"/>
+ </target>
+
+ <target name="service-jar" depends="aop-jar, aopc-jar"/>
+
+ <target name="aop-jar" depends="compile">
+ <jar destfile="${aop.jar}">
+ <fileset dir="${aop.classes.dir}"/>
+ <fileset dir="${aop.resources.dir}"/>
+ </jar>
+ </target>
+
+ <target name="aopc-jar">
+ <taskdef name="aopc" classname="org.jboss.aop.ant.AopC"
+ classpathref="classpath"/>
+
+ <delete dir="${aopc.classes.dir}" quiet="true"/>
+ <mkdir dir="${aopc.classes.dir}"/>
+
+ <unzip dest="${aopc.classes.dir}" src="lib/ext/${smooks.jar}"/>
+
+ <aopc compilerclasspathref="classpath" verbose="true">
+ <classpath path="${aopc.classes.dir}"/>
+ <src path="${aopc.classes.dir}"/>
+ <include name="org/milyn/cdr/SmooksResourceConfigurationStore.class"/>
+
+ <aoppath path="${aop.resources.dir}/META-INF/jboss-aop.xml"/>
+ <aopclasspath path="${aop.classes.dir}"/>
+ </aopc>
+ <zip destfile="${build.dir}/${smooks.jar}"
+ basedir="${aopc.classes.dir}"/>
+ </target>
+
+ <target name="service-esb" depends="base-esb">
+ <copy file="${aop.jar}" todir="${build.dir}/${ant.project.name}.esb"/>
+ </target>
</project>
More information about the jboss-svn-commits
mailing list