[webbeans-commits] Webbeans SVN: r594 - in ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans: event and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2008-12-19 13:32:52 -0500 (Fri, 19 Dec 2008)
New Revision: 594
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/DeferredEventNotification.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java
Log:
Refactored transactional observer code for better encapsulation and runtime performance.
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2008-12-19 18:29:25 UTC (rev 593)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2008-12-19 18:32:52 UTC (rev 594)
@@ -109,7 +109,7 @@
this.decorators = new HashSet<Decorator>();
this.interceptors = new HashSet<Interceptor>();
this.contextMap = new ContextMap();
- this.eventManager = new EventManager(this);
+ this.eventManager = new EventManager();
this.ejbDescriptorCache = new EjbDescriptorCache();
List<Class<? extends Annotation>> defaultEnabledDeploymentTypes = new ArrayList<Class<? extends Annotation>>();
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/DeferredEventNotification.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/DeferredEventNotification.java 2008-12-19 18:29:25 UTC (rev 593)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/DeferredEventNotification.java 2008-12-19 18:32:52 UTC (rev 594)
@@ -21,10 +21,10 @@
import javax.transaction.Synchronization;
import javax.webbeans.Observer;
-import static org.jboss.webbeans.event.EventManager.TransactionObservationPhase.AFTER_COMPLETION;
-import static org.jboss.webbeans.event.EventManager.TransactionObservationPhase.AFTER_SUCCESS;
-import static org.jboss.webbeans.event.EventManager.TransactionObservationPhase.AFTER_FAILURE;
-import static org.jboss.webbeans.event.EventManager.TransactionObservationPhase.BEFORE_COMPLETION;
+import static org.jboss.webbeans.event.ObserverImpl.TransactionObservationPhase.AFTER_COMPLETION;
+import static org.jboss.webbeans.event.ObserverImpl.TransactionObservationPhase.AFTER_SUCCESS;
+import static org.jboss.webbeans.event.ObserverImpl.TransactionObservationPhase.AFTER_FAILURE;
+import static org.jboss.webbeans.event.ObserverImpl.TransactionObservationPhase.BEFORE_COMPLETION;
/**
* A synchronization object which will deliver the event to the observer after
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java 2008-12-19 18:29:25 UTC (rev 593)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java 2008-12-19 18:32:52 UTC (rev 594)
@@ -25,13 +25,9 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
-import javax.transaction.Status;
-import javax.transaction.SystemException;
import javax.webbeans.Observer;
-import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.contexts.DependentContext;
-import org.jboss.webbeans.transaction.UserTransaction;
import org.jboss.webbeans.util.Reflections;
import org.jboss.webbeans.util.Strings;
@@ -45,18 +41,7 @@
*/
public class EventManager
{
- private ManagerImpl manager;
-
- /**
- * The known transactional phases a transactional event observer can be
- * interested in
- */
- protected enum TransactionObservationPhase
- {
- NONE, BEFORE_COMPLETION, AFTER_COMPLETION, AFTER_FAILURE, AFTER_SUCCESS
- }
-
- /**
+ /**
* An event type -> observer list map
*/
private class RegisteredObserversMap extends ForwardingMap<Class<?>, List<EventObserver<?>>>
@@ -140,12 +125,9 @@
/**
* Initializes a new instance of the EventManager.
- *
- * @param manager The Web Beans manager
*/
- public EventManager(ManagerImpl manager)
+ public EventManager()
{
- this.manager = manager;
registeredObservers = new RegisteredObserversMap();
}
@@ -189,24 +171,6 @@
}
/**
- * Checks if there is currently a transaction active
- *
- * @return True if there is one, false otherwise
- */
- private boolean isTransactionActive()
- {
- UserTransaction userTransaction = manager.getInstanceByType(UserTransaction.class);
- try
- {
- return userTransaction!=null && userTransaction.getStatus() == Status.STATUS_ACTIVE;
- }
- catch (SystemException e)
- {
- return false;
- }
- }
-
- /**
* Iterates over the interested observers. If an observer is transactional
* and there is a transaction currently in progress, the event is deferred.
* In other cases, the observer is notified immediately.
@@ -221,14 +185,7 @@
DependentContext.INSTANCE.setActive(true);
for (Observer<T> observer : observers)
{
- if ((observer instanceof ObserverImpl) && isTransactionActive() && ((ObserverImpl<?>) observer).isTransactional())
- {
- deferEvent(event, observer);
- }
- else
- {
- observer.notify(event);
- }
+ observer.notify(event);
}
}
finally
@@ -238,22 +195,6 @@
}
/**
- * Defers an event for processing in a later phase of the current transaction.
- *
- * Gets the transaction listener, creates a deferred event representation and
- * registers the deferred event.
- *
- * @param event The event type
- * @param observer The interested observer
- */
- private <T> void deferEvent(T event, Observer<T> observer)
- {
- UserTransaction userTransaction = manager.getInstanceByType(UserTransaction.class);
- DeferredEventNotification<T> deferredEvent = new DeferredEventNotification<T>(event, observer);
- userTransaction.registerSynchronization(deferredEvent);
- }
-
- /**
* Removes an observer from the event bus.
*
* @param observer The observer to remove
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2008-12-19 18:29:25 UTC (rev 593)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2008-12-19 18:32:52 UTC (rev 594)
@@ -17,16 +17,12 @@
package org.jboss.webbeans.event;
-import static org.jboss.webbeans.event.EventManager.TransactionObservationPhase.AFTER_COMPLETION;
-import static org.jboss.webbeans.event.EventManager.TransactionObservationPhase.AFTER_FAILURE;
-import static org.jboss.webbeans.event.EventManager.TransactionObservationPhase.AFTER_SUCCESS;
-import static org.jboss.webbeans.event.EventManager.TransactionObservationPhase.BEFORE_COMPLETION;
-import static org.jboss.webbeans.event.EventManager.TransactionObservationPhase.NONE;
-
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.List;
+import javax.transaction.Status;
+import javax.transaction.SystemException;
import javax.webbeans.AfterTransactionCompletion;
import javax.webbeans.AfterTransactionFailure;
import javax.webbeans.AfterTransactionSuccess;
@@ -44,9 +40,9 @@
import javax.webbeans.manager.Bean;
import org.jboss.webbeans.ManagerImpl;
-import org.jboss.webbeans.event.EventManager.TransactionObservationPhase;
import org.jboss.webbeans.introspector.AnnotatedMethod;
import org.jboss.webbeans.introspector.AnnotatedParameter;
+import org.jboss.webbeans.transaction.UserTransaction;
import org.jboss.webbeans.util.Reflections;
/**
@@ -62,7 +58,16 @@
*/
public class ObserverImpl<T> implements Observer<T>
{
- private Bean<?> eventBean;
+ /**
+ * The known transactional phases a transactional event observer can be
+ * interested in
+ */
+ protected enum TransactionObservationPhase
+ {
+ NONE, BEFORE_COMPLETION, AFTER_COMPLETION, AFTER_FAILURE, AFTER_SUCCESS
+ }
+
+ private Bean<?> observerBean;
private final AnnotatedMethod<Object> observerMethod;
private TransactionObservationPhase transactionObservationPhase;
private boolean conditional;
@@ -80,7 +85,7 @@
public ObserverImpl(final AnnotatedMethod<Object> observer, final Bean<?> observerBean, final ManagerImpl manager)
{
this.manager = manager;
- this.eventBean = observerBean;
+ this.observerBean = observerBean;
this.observerMethod = observer;
validateObserverMethod();
initTransactionObservationPhase();
@@ -92,19 +97,19 @@
List<TransactionObservationPhase> observationPhases = new ArrayList<TransactionObservationPhase>();
if (!observerMethod.getAnnotatedParameters(BeforeTransactionCompletion.class).isEmpty())
{
- observationPhases.add(BEFORE_COMPLETION);
+ observationPhases.add(TransactionObservationPhase.BEFORE_COMPLETION);
}
if (!observerMethod.getAnnotatedParameters(AfterTransactionCompletion.class).isEmpty())
{
- observationPhases.add(AFTER_COMPLETION);
+ observationPhases.add(TransactionObservationPhase.AFTER_COMPLETION);
}
if (!observerMethod.getAnnotatedParameters(AfterTransactionFailure.class).isEmpty())
{
- observationPhases.add(AFTER_FAILURE);
+ observationPhases.add(TransactionObservationPhase.AFTER_FAILURE);
}
if (!observerMethod.getAnnotatedParameters(AfterTransactionSuccess.class).isEmpty())
{
- observationPhases.add(AFTER_SUCCESS);
+ observationPhases.add(TransactionObservationPhase.AFTER_SUCCESS);
}
if (observationPhases.size() > 1)
{
@@ -116,7 +121,7 @@
}
else
{
- transactionObservationPhase = NONE;
+ transactionObservationPhase = TransactionObservationPhase.NONE;
}
}
@@ -171,7 +176,14 @@
{
try
{
- observerMethod.invokeWithSpecialValue(instance, Observes.class, event, manager);
+ if ( isTransactional() && isTransactionActive() )
+ {
+ deferEvent(event);
+ }
+ else
+ {
+ observerMethod.invokeWithSpecialValue(instance, Observes.class, event, manager);
+ }
}
catch (ExecutionException e)
{
@@ -202,10 +214,43 @@
protected Object getInstance(boolean create)
{
// Return the most specialized instance of the component
- return manager.getMostSpecializedInstance(eventBean, create);
+ return manager.getMostSpecializedInstance(observerBean, create);
}
/**
+ * Checks if there is currently a transaction active
+ *
+ * @return True if there is one, false otherwise
+ */
+ private boolean isTransactionActive()
+ {
+ UserTransaction userTransaction = manager.getInstanceByType(UserTransaction.class);
+ try
+ {
+ return userTransaction!=null && userTransaction.getStatus() == Status.STATUS_ACTIVE;
+ }
+ catch (SystemException e)
+ {
+ return false;
+ }
+ }
+
+ /**
+ * Defers an event for processing in a later phase of the current transaction.
+ *
+ * Gets the transaction listener, creates a deferred event representation and
+ * registers the deferred event.
+ *
+ * @param event The event type
+ */
+ private void deferEvent(T event)
+ {
+ UserTransaction userTransaction = manager.getInstanceByType(UserTransaction.class);
+ DeferredEventNotification<T> deferredEvent = new DeferredEventNotification<T>(event, this);
+ userTransaction.registerSynchronization(deferredEvent);
+ }
+
+ /**
* Indicates if the observer is transactional
*
* @return True if transactional, false otherwise
@@ -241,7 +286,7 @@
{
StringBuilder builder = new StringBuilder();
builder.append("Observer Implentation: \n");
- builder.append(" Observer (Declaring) bean: " + eventBean);
+ builder.append(" Observer (Declaring) bean: " + observerBean);
builder.append(" Observer method: " + observerMethod);
return builder.toString();
}
16 years, 1 month
[webbeans-commits] Webbeans SVN: r593 - in ri/trunk/jboss-as: resources and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-19 13:29:25 -0500 (Fri, 19 Dec 2008)
New Revision: 593
Added:
ri/trunk/jboss-as/resources/jboss-structure.xml
ri/trunk/jboss-as/resources/webbeans-deployers-jboss-beans.xml
Removed:
ri/trunk/jboss-as/jboss-structure.xml
ri/trunk/jboss-as/webbeans-deployers-jboss-beans.xml
Modified:
ri/trunk/jboss-as/build.xml
Log:
update script
Modified: ri/trunk/jboss-as/build.xml
===================================================================
--- ri/trunk/jboss-as/build.xml 2008-12-19 18:26:43 UTC (rev 592)
+++ ri/trunk/jboss-as/build.xml 2008-12-19 18:29:25 UTC (rev 593)
@@ -1,14 +1,18 @@
<?xml version="1.0"?>
<project name="JBoss5DeployerInstall" default="update" basedir="." xmlns:artifact="urn:maven-artifact-ant">
- <path id="maven-ant-tasks.classpath" path="lib/maven-ant-tasks.jar" />
+ <path id="maven-ant-tasks.classpath" path="../lib/maven-ant-tasks.jar" />
<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" />
<property name="maven.dir" location="${basedir}/maven" />
<property file="build.properties" />
+
+ <target name="clean" description="Clean up after the JBoss updater">
+ <delete dir="target" failonerror="false"/>
+ </target>
- <target name="update" depends="install-jboss-ejb3-update">
+ <target name="update" depends="install-jboss-ejb3-update" description="Update JBoss 5 for the Web Beans RI">
<fail unless="jboss.home" message="Please pass in -Djboss.home=..."/>
@@ -37,7 +41,7 @@
<mkdir dir="target/webbeans.deployer/META-INF" />
<copy todir="target/webbeans.deployer/META-INF">
- <fileset dir="${basedir}/webbeans-ri">
+ <fileset dir="${basedir}/resources">
<include name="webbeans-deployers-jboss-beans.xml"/>
<include name="jboss-structure.xml"/>
</fileset>
Deleted: ri/trunk/jboss-as/jboss-structure.xml
===================================================================
--- ri/trunk/jboss-as/jboss-structure.xml 2008-12-19 18:26:43 UTC (rev 592)
+++ ri/trunk/jboss-as/jboss-structure.xml 2008-12-19 18:29:25 UTC (rev 593)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<structure>
- <context>
- <path name=""/>
- <metaDataPath>
- <path name="META-INF"/>
- </metaDataPath>
- <classpath>
- <path name="" suffixes=".jar" />
- </classpath>
- </context>
-</structure>
Copied: ri/trunk/jboss-as/resources/jboss-structure.xml (from rev 592, ri/trunk/jboss-as/jboss-structure.xml)
===================================================================
--- ri/trunk/jboss-as/resources/jboss-structure.xml (rev 0)
+++ ri/trunk/jboss-as/resources/jboss-structure.xml 2008-12-19 18:29:25 UTC (rev 593)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<structure>
+ <context>
+ <path name=""/>
+ <metaDataPath>
+ <path name="META-INF"/>
+ </metaDataPath>
+ <classpath>
+ <path name="" suffixes=".jar" />
+ </classpath>
+ </context>
+</structure>
Copied: ri/trunk/jboss-as/resources/webbeans-deployers-jboss-beans.xml (from rev 592, ri/trunk/jboss-as/webbeans-deployers-jboss-beans.xml)
===================================================================
--- ri/trunk/jboss-as/resources/webbeans-deployers-jboss-beans.xml (rev 0)
+++ ri/trunk/jboss-as/resources/webbeans-deployers-jboss-beans.xml 2008-12-19 18:29:25 UTC (rev 593)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Web Beans RI + JBossAS integration
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- Web Beans deployer -->
+ <bean name="WebBeansDeployer" class="org.jboss.webbeans.integration.microcontainer.WebBeanDiscoveryDeployer"/>
+
+</deployment>
Deleted: ri/trunk/jboss-as/webbeans-deployers-jboss-beans.xml
===================================================================
--- ri/trunk/jboss-as/webbeans-deployers-jboss-beans.xml 2008-12-19 18:26:43 UTC (rev 592)
+++ ri/trunk/jboss-as/webbeans-deployers-jboss-beans.xml 2008-12-19 18:29:25 UTC (rev 593)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Web Beans RI + JBossAS integration
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- Web Beans deployer -->
- <bean name="WebBeansDeployer" class="org.jboss.webbeans.integration.microcontainer.WebBeanDiscoveryDeployer"/>
-
-</deployment>
16 years, 1 month
[webbeans-commits] Webbeans SVN: r592 - ri/trunk.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-19 13:26:43 -0500 (Fri, 19 Dec 2008)
New Revision: 592
Added:
ri/trunk/jboss-as/
Removed:
ri/trunk/jboss/
Log:
rename jboss dir
Copied: ri/trunk/jboss-as (from rev 591, ri/trunk/jboss)
16 years, 1 month
[webbeans-commits] Webbeans SVN: r591 - in ri/trunk: examples and 7 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-19 13:25:48 -0500 (Fri, 19 Dec 2008)
New Revision: 591
Added:
ri/trunk/jboss/
ri/trunk/jboss/build.properties
ri/trunk/jboss/build.xml
ri/trunk/jboss/jboss-structure.xml
ri/trunk/jboss/resources/
ri/trunk/jboss/webbeans-deployers-jboss-beans.xml
Removed:
ri/trunk/build.properties
ri/trunk/build.xml
ri/trunk/webbeans-ri/jboss-structure.xml
ri/trunk/webbeans-ri/webbeans-deployers-jboss-beans.xml
Modified:
ri/trunk/examples/build.xml
ri/trunk/examples/readme.txt
ri/trunk/webbeans-api/
ri/trunk/webbeans-api/.settings/org.eclipse.jdt.core.prefs
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/spi/EjbDescriptor.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/DefaultEnterpriseBeanLookup.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDescriptor.java
Log:
make jboss dir
Deleted: ri/trunk/build.properties
===================================================================
--- ri/trunk/build.properties 2008-12-19 18:24:14 UTC (rev 590)
+++ ri/trunk/build.properties 2008-12-19 18:25:48 UTC (rev 591)
@@ -1 +0,0 @@
-jboss.home=/Applications/jboss-5.0.0.GA
Deleted: ri/trunk/build.xml
===================================================================
--- ri/trunk/build.xml 2008-12-19 18:24:14 UTC (rev 590)
+++ ri/trunk/build.xml 2008-12-19 18:25:48 UTC (rev 591)
@@ -1,101 +0,0 @@
-<?xml version="1.0"?>
-<project name="JBoss5DeployerInstall" default="update" basedir="." xmlns:artifact="urn:maven-artifact-ant">
-
- <path id="maven-ant-tasks.classpath" path="lib/maven-ant-tasks.jar" />
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" />
-
- <property name="maven.dir" location="${basedir}/maven" />
-
- <property file="build.properties" />
-
- <target name="update" depends="install-jboss-ejb3-update">
-
- <fail unless="jboss.home" message="Please pass in -Djboss.home=..."/>
-
- <delete dir="${jboss.home}/server/default/deployers/webbeans.deployer" failonerror="false" />
-
- <mkdir dir="target/webbeans.deployer"/>
-
- <artifact:dependencies filesetId="jboss5.deployer.fileset" versionsId="jboss5.deployer.versions">
- <dependency groupId="org.jboss.webbeans.integration" artifactId="webbeans-ri-int-microcontainer" version="5.2.0-SNAPSHOT"/>
- <dependency groupId="org.jboss.webbeans.integration" artifactId="webbeans-ri-int-jbossas" version="5.2.0-SNAPSHOT"/>
- <remoteRepository id="snapshots.jboss.org" url="http://snapshots.jboss.org/maven2">
- <snapshots updatePolicy="always" />
- </remoteRepository>
- <remoteRepository id="repository.jboss.org" url="http://repository.jboss.org/maven2" />
- </artifact:dependencies>
-
- <artifact:dependencies filesetId="google.collections.fileset">
- <dependency groupId="com.google.collections" artifactId="google-collections" version="0.8"/>
- </artifact:dependencies>
-
- <copy todir="target/webbeans.deployer">
- <fileset refid="jboss5.deployer.fileset"/>
- <flattenmapper />
- </copy>
-
- <mkdir dir="target/webbeans.deployer/META-INF" />
-
- <copy todir="target/webbeans.deployer/META-INF">
- <fileset dir="${basedir}/webbeans-ri">
- <include name="webbeans-deployers-jboss-beans.xml"/>
- <include name="jboss-structure.xml"/>
- </fileset>
- </copy>
-
- <copy todir="${jboss.home}/server/default/deployers/webbeans.deployer">
- <fileset dir="target/webbeans.deployer">
- <include name="**/*.xml" />
- <include name="webbeans-*.jar" />
- <include name="google*.jar" />
- </fileset>
- <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${jboss5.deployer.versions}" to="flatten" />
- </copy>
-
- </target>
-
- <target name="install-jboss-ejb3-update">
-
- <fail unless="jboss.home" message="Please pass in -Djboss.home=..."/>
-
- <artifact:dependencies filesetId="jboss.ejb3.plugin.fileset" versionsId="jboss.ejb3.plugin.versions">
- <dependency groupId="org.jboss.ejb3" artifactId="jboss-ejb3-plugin" version="1.0.0-Alpha1" classifier="installer"/>
- <remoteRepository id="repository.jboss.org" url="http://repository.jboss.org/maven2" />
- </artifact:dependencies>
-
- <mkdir dir="target/ejb3.plugin"/>
- <copy todir="target/ejb3.plugin">
- <fileset refid="jboss.ejb3.plugin.fileset"/>
- <chainedmapper>
- <flattenmapper />
- <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${jboss.ejb3.plugin.versions}" to="flatten" />
- </chainedmapper>
- </copy>
- <java jar="target/ejb3.plugin/jboss-ejb3-plugin-installer.jar" fork="true">
- <arg line="${jboss.home}" />
- </java>
- </target>
-
- <macrodef name="maven">
- <attribute name="target" />
- <attribute name="basedir" />
- <element name="args" implicit="true" optional="true" />
- <sequential>
- <java classname="org.codehaus.classworlds.Launcher" fork="true" dir="@{basedir}">
- <classpath>
- <fileset dir="${maven.dir}/boot">
- <include name="*.jar" />
- </fileset>
- <fileset dir="${maven.dir}/bin">
- <include name="*.*" />
- </fileset>
- </classpath>
- <sysproperty key="classworlds.conf" value="${maven.dir}/bin/m2.conf" />
- <sysproperty key="maven.home" value="${maven.dir}" />
- <args />
- <arg line="@{target}" />
- </java>
- </sequential>
- </macrodef>
-
-</project>
\ No newline at end of file
Modified: ri/trunk/examples/build.xml
===================================================================
--- ri/trunk/examples/build.xml 2008-12-19 18:24:14 UTC (rev 590)
+++ ri/trunk/examples/build.xml 2008-12-19 18:25:48 UTC (rev 591)
@@ -6,6 +6,8 @@
<property file="${wbri.dir}/build.properties"/>
+ <property name="final.url" value="http://localhost:8080/${example.name}" />
+
<property name="type" value="war" />
<condition property="war">
@@ -37,6 +39,7 @@
<target name="deploy" depends="package">
<copy todir="${jboss.home}/server/default/deploy/" file="${artifact.target.dir}/${example.name}.${type}"/>
+ <echo message="The app can be accessed at ${final.url}" />
</target>
<target name="clean">
@@ -52,6 +55,7 @@
</target>
<target name="restart" depends="restart.war, restart.ear">
+ <echo message="The app can be accessed at ${final.url}" />
</target>
<target name="undeploy">
Modified: ri/trunk/examples/readme.txt
===================================================================
--- ri/trunk/examples/readme.txt 2008-12-19 18:24:14 UTC (rev 590)
+++ ri/trunk/examples/readme.txt 2008-12-19 18:25:48 UTC (rev 591)
@@ -1,8 +1,11 @@
-The Web Beans RI currently comes with a single example, webbeans-numberguess.
+The Web Beans RI currently comes with a two examples, webbeans-numberguess (a
+war example) and webbeans-translator (an EJB example).
To run the example on JBoss AS 5.0.0.GA, you need to add the Web Beans RI
-deployer to JBoss 5. First, set the path to JBoss 5 in ../build.properties.
-Then, run ant -f ../build.xml install-jboss5 in the examples directory.
+deployer to JBoss 5. First, set the path to JBoss 5 in ../build.properties.
+Make sure you have the ANT_HOME environment variable set, and pointing to your
+ant install. Then, run ant -f ../build.xml install-jboss5 in the examples
+directory.
To deploy the example to JBoss AS 5, change into numberguess directory and
choose between:
Copied: ri/trunk/jboss/build.properties (from rev 568, ri/trunk/build.properties)
===================================================================
--- ri/trunk/jboss/build.properties (rev 0)
+++ ri/trunk/jboss/build.properties 2008-12-19 18:25:48 UTC (rev 591)
@@ -0,0 +1 @@
+jboss.home=/Applications/jboss-5.0.0.GA
Copied: ri/trunk/jboss/build.xml (from rev 590, ri/trunk/build.xml)
===================================================================
--- ri/trunk/jboss/build.xml (rev 0)
+++ ri/trunk/jboss/build.xml 2008-12-19 18:25:48 UTC (rev 591)
@@ -0,0 +1,101 @@
+<?xml version="1.0"?>
+<project name="JBoss5DeployerInstall" default="update" basedir="." xmlns:artifact="urn:maven-artifact-ant">
+
+ <path id="maven-ant-tasks.classpath" path="lib/maven-ant-tasks.jar" />
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" />
+
+ <property name="maven.dir" location="${basedir}/maven" />
+
+ <property file="build.properties" />
+
+ <target name="update" depends="install-jboss-ejb3-update">
+
+ <fail unless="jboss.home" message="Please pass in -Djboss.home=..."/>
+
+ <delete dir="${jboss.home}/server/default/deployers/webbeans.deployer" failonerror="false" />
+
+ <mkdir dir="target/webbeans.deployer"/>
+
+ <artifact:dependencies filesetId="jboss5.deployer.fileset" versionsId="jboss5.deployer.versions">
+ <dependency groupId="org.jboss.webbeans.integration" artifactId="webbeans-ri-int-microcontainer" version="5.2.0-SNAPSHOT"/>
+ <dependency groupId="org.jboss.webbeans.integration" artifactId="webbeans-ri-int-jbossas" version="5.2.0-SNAPSHOT"/>
+ <remoteRepository id="snapshots.jboss.org" url="http://snapshots.jboss.org/maven2">
+ <snapshots updatePolicy="always" />
+ </remoteRepository>
+ <remoteRepository id="repository.jboss.org" url="http://repository.jboss.org/maven2" />
+ </artifact:dependencies>
+
+ <artifact:dependencies filesetId="google.collections.fileset">
+ <dependency groupId="com.google.collections" artifactId="google-collections" version="0.8"/>
+ </artifact:dependencies>
+
+ <copy todir="target/webbeans.deployer">
+ <fileset refid="jboss5.deployer.fileset"/>
+ <flattenmapper />
+ </copy>
+
+ <mkdir dir="target/webbeans.deployer/META-INF" />
+
+ <copy todir="target/webbeans.deployer/META-INF">
+ <fileset dir="${basedir}/webbeans-ri">
+ <include name="webbeans-deployers-jboss-beans.xml"/>
+ <include name="jboss-structure.xml"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${jboss.home}/server/default/deployers/webbeans.deployer">
+ <fileset dir="target/webbeans.deployer">
+ <include name="**/*.xml" />
+ <include name="webbeans-*.jar" />
+ <include name="google*.jar" />
+ </fileset>
+ <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${jboss5.deployer.versions}" to="flatten" />
+ </copy>
+
+ </target>
+
+ <target name="install-jboss-ejb3-update">
+
+ <fail unless="jboss.home" message="Please pass in -Djboss.home=..."/>
+
+ <artifact:dependencies filesetId="jboss.ejb3.plugin.fileset" versionsId="jboss.ejb3.plugin.versions">
+ <dependency groupId="org.jboss.ejb3" artifactId="jboss-ejb3-plugin" version="1.0.0-Alpha1" classifier="installer"/>
+ <remoteRepository id="repository.jboss.org" url="http://repository.jboss.org/maven2" />
+ </artifact:dependencies>
+
+ <mkdir dir="target/ejb3.plugin"/>
+ <copy todir="target/ejb3.plugin">
+ <fileset refid="jboss.ejb3.plugin.fileset"/>
+ <chainedmapper>
+ <flattenmapper />
+ <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${jboss.ejb3.plugin.versions}" to="flatten" />
+ </chainedmapper>
+ </copy>
+ <java jar="target/ejb3.plugin/jboss-ejb3-plugin-installer.jar" fork="true">
+ <arg line="${jboss.home}" />
+ </java>
+ </target>
+
+ <macrodef name="maven">
+ <attribute name="target" />
+ <attribute name="basedir" />
+ <element name="args" implicit="true" optional="true" />
+ <sequential>
+ <java classname="org.codehaus.classworlds.Launcher" fork="true" dir="@{basedir}">
+ <classpath>
+ <fileset dir="${maven.dir}/boot">
+ <include name="*.jar" />
+ </fileset>
+ <fileset dir="${maven.dir}/bin">
+ <include name="*.*" />
+ </fileset>
+ </classpath>
+ <sysproperty key="classworlds.conf" value="${maven.dir}/bin/m2.conf" />
+ <sysproperty key="maven.home" value="${maven.dir}" />
+ <args />
+ <arg line="@{target}" />
+ </java>
+ </sequential>
+ </macrodef>
+
+</project>
\ No newline at end of file
Copied: ri/trunk/jboss/jboss-structure.xml (from rev 568, ri/trunk/webbeans-ri/jboss-structure.xml)
===================================================================
--- ri/trunk/jboss/jboss-structure.xml (rev 0)
+++ ri/trunk/jboss/jboss-structure.xml 2008-12-19 18:25:48 UTC (rev 591)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<structure>
+ <context>
+ <path name=""/>
+ <metaDataPath>
+ <path name="META-INF"/>
+ </metaDataPath>
+ <classpath>
+ <path name="" suffixes=".jar" />
+ </classpath>
+ </context>
+</structure>
Copied: ri/trunk/jboss/webbeans-deployers-jboss-beans.xml (from rev 568, ri/trunk/webbeans-ri/webbeans-deployers-jboss-beans.xml)
===================================================================
--- ri/trunk/jboss/webbeans-deployers-jboss-beans.xml (rev 0)
+++ ri/trunk/jboss/webbeans-deployers-jboss-beans.xml 2008-12-19 18:25:48 UTC (rev 591)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Web Beans RI + JBossAS integration
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- Web Beans deployer -->
+ <bean name="WebBeansDeployer" class="org.jboss.webbeans.integration.microcontainer.WebBeanDiscoveryDeployer"/>
+
+</deployment>
Property changes on: ri/trunk/webbeans-api
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
target
+ .classpath
.project
target
cobertura.ser
Modified: ri/trunk/webbeans-api/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- ri/trunk/webbeans-api/.settings/org.eclipse.jdt.core.prefs 2008-12-19 18:24:14 UTC (rev 590)
+++ ri/trunk/webbeans-api/.settings/org.eclipse.jdt.core.prefs 2008-12-19 18:25:48 UTC (rev 591)
@@ -1,4 +1,4 @@
-#Wed Dec 10 10:36:17 CET 2008
+#Tue Dec 16 18:57:16 GMT 2008
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.source=1.5
Deleted: ri/trunk/webbeans-ri/jboss-structure.xml
===================================================================
--- ri/trunk/webbeans-ri/jboss-structure.xml 2008-12-19 18:24:14 UTC (rev 590)
+++ ri/trunk/webbeans-ri/jboss-structure.xml 2008-12-19 18:25:48 UTC (rev 591)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<structure>
- <context>
- <path name=""/>
- <metaDataPath>
- <path name="META-INF"/>
- </metaDataPath>
- <classpath>
- <path name="" suffixes=".jar" />
- </classpath>
- </context>
-</structure>
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/spi/EjbDescriptor.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/spi/EjbDescriptor.java 2008-12-19 18:24:14 UTC (rev 590)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/spi/EjbDescriptor.java 2008-12-19 18:25:48 UTC (rev 591)
@@ -91,4 +91,6 @@
*/
public String getEjbName();
+ public String getLocalJndiName();
+
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/DefaultEnterpriseBeanLookup.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/DefaultEnterpriseBeanLookup.java 2008-12-19 18:24:14 UTC (rev 590)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/DefaultEnterpriseBeanLookup.java 2008-12-19 18:25:48 UTC (rev 591)
@@ -70,19 +70,14 @@
@SuppressWarnings("unchecked")
public static <T> T lookup(EjbDescriptor<T> ejbDescriptor)
{
- if (!ejbDescriptor.getLocalBusinessInterfaces().iterator().hasNext())
- {
- throw new RuntimeException("EJB must have local interface " + ejbDescriptor);
- }
- String jndiName = ejbDescriptor.getLocalBusinessInterfaces().iterator().next().getJndiName();
try
{
// TODO Implement enterprise proxies and select the correct jndiName
- return (T) JNDI.lookup(jndiName);
+ return (T) JNDI.lookup(ejbDescriptor.getLocalJndiName());
}
catch (Exception e)
{
- throw new CreationException("could not find the name in JNDI " + jndiName, e);
+ throw new CreationException("could not find the name in JNDI " + ejbDescriptor.getLocalJndiName(), e);
}
}
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDescriptor.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDescriptor.java 2008-12-19 18:24:14 UTC (rev 590)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDescriptor.java 2008-12-19 18:25:48 UTC (rev 591)
@@ -121,6 +121,11 @@
return type.isAnnotationPresent(Stateless.class);
}
+ public String getLocalJndiName()
+ {
+ return type.getSimpleName() + "/local";
+ }
+
@Override
public String toString()
{
Deleted: ri/trunk/webbeans-ri/webbeans-deployers-jboss-beans.xml
===================================================================
--- ri/trunk/webbeans-ri/webbeans-deployers-jboss-beans.xml 2008-12-19 18:24:14 UTC (rev 590)
+++ ri/trunk/webbeans-ri/webbeans-deployers-jboss-beans.xml 2008-12-19 18:25:48 UTC (rev 591)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Web Beans RI + JBossAS integration
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- Web Beans deployer -->
- <bean name="WebBeansDeployer" class="org.jboss.webbeans.integration.microcontainer.WebBeanDiscoveryDeployer"/>
-
-</deployment>
16 years, 1 month
[webbeans-commits] Webbeans SVN: r590 - ri/trunk.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-19 13:24:14 -0500 (Fri, 19 Dec 2008)
New Revision: 590
Modified:
ri/trunk/build.xml
Log:
update target name
Modified: ri/trunk/build.xml
===================================================================
--- ri/trunk/build.xml 2008-12-19 18:12:26 UTC (rev 589)
+++ ri/trunk/build.xml 2008-12-19 18:24:14 UTC (rev 590)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<project name="JBoss5DeployerInstall" default="install-jboss5" basedir="." xmlns:artifact="urn:maven-artifact-ant">
+<project name="JBoss5DeployerInstall" default="update" basedir="." xmlns:artifact="urn:maven-artifact-ant">
<path id="maven-ant-tasks.classpath" path="lib/maven-ant-tasks.jar" />
<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" />
@@ -8,10 +8,12 @@
<property file="build.properties" />
- <target name="install-jboss5" depends="install-jboss-ejb3-update, install">
+ <target name="update" depends="install-jboss-ejb3-update">
<fail unless="jboss.home" message="Please pass in -Djboss.home=..."/>
+ <delete dir="${jboss.home}/server/default/deployers/webbeans.deployer" failonerror="false" />
+
<mkdir dir="target/webbeans.deployer"/>
<artifact:dependencies filesetId="jboss5.deployer.fileset" versionsId="jboss5.deployer.versions">
@@ -73,10 +75,6 @@
<arg line="${jboss.home}" />
</java>
</target>
-
- <target name="install">
- <maven target="install" basedir="${basedir}"/>
- </target>
<macrodef name="maven">
<attribute name="target" />
16 years, 1 month
[webbeans-commits] Webbeans SVN: r589 - doc/trunk/reference.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-19 13:12:26 -0500 (Fri, 19 Dec 2008)
New Revision: 589
Modified:
doc/trunk/reference/pom.xml
Log:
Update to use full author style
Modified: doc/trunk/reference/pom.xml
===================================================================
--- doc/trunk/reference/pom.xml 2008-12-19 18:09:59 UTC (rev 588)
+++ doc/trunk/reference/pom.xml 2008-12-19 18:12:26 UTC (rev 589)
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-docbook-xslt</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.1.1.BETA2</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.wst.css</groupId>
@@ -84,14 +84,14 @@
<format>
<formatName>html</formatName>
<stylesheetResource>
- classpath:/xslt/org/jboss/seam/xhtml.xsl
+ classpath:/xslt/org/jboss/webbeans/xhtml.xsl
</stylesheetResource>
<finalName>index.html</finalName>
</format>
<format>
<formatName>html_single</formatName>
<stylesheetResource>
- classpath:/xslt/org/jboss/seam/xhtml-single.xsl
+ classpath:/xslt/org/jboss/webbeans/xhtml-single.xsl
</stylesheetResource>
<finalName>index.html</finalName>
</format>
16 years, 1 month
[webbeans-commits] Webbeans SVN: r587 - in doc/tags: webbeans-docbook-xslt-1.1.1.BETA2 and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-19 13:09:55 -0500 (Fri, 19 Dec 2008)
New Revision: 587
Added:
doc/tags/webbeans-docbook-xslt-1.1.1.BETA2/
doc/tags/webbeans-docbook-xslt-1.1.1.BETA2/pom.xml
doc/tags/webbeans-docbook-xslt-1.1.1.BETA2/src/main/resources/xslt/org/jboss/webbeans/xhtml-single.xsl
doc/tags/webbeans-docbook-xslt-1.1.1.BETA2/src/main/resources/xslt/org/jboss/webbeans/xhtml.xsl
Removed:
doc/tags/webbeans-docbook-xslt-1.1.1.BETA2/pom.xml
Log:
[maven-release-plugin] copy for tag webbeans-docbook-xslt-1.1.1.BETA2
Copied: doc/tags/webbeans-docbook-xslt-1.1.1.BETA2 (from rev 582, doc/trunk/xslt)
Deleted: doc/tags/webbeans-docbook-xslt-1.1.1.BETA2/pom.xml
===================================================================
--- doc/trunk/xslt/pom.xml 2008-12-19 17:43:40 UTC (rev 582)
+++ doc/tags/webbeans-docbook-xslt-1.1.1.BETA2/pom.xml 2008-12-19 18:09:55 UTC (rev 587)
@@ -1,91 +0,0 @@
-<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>
-
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-docbook-xslt</artifactId>
- <packaging>jar</packaging>
- <version>1.1.1.BETA1</version>
-
- <name>Web Beans DocBook XSLT</name>
- <description>
- The main project to transform DocBook XML into XHTML and other formats for
- SeamFramework.org Documentation.
- </description>
- <url>http://www.seamframework.org</url>
-
- <scm>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/doc/tags/webbeans-docbook-xs...</developerConnection>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/doc/tags/webbeans-docbook...</connection>
- </scm>
-
- <contributors>
- <contributor>
- <name>Pete Muir</name>
- </contributor>
- <contributor>
- <name>Mark Newton</name>
- </contributor>
- </contributors>
-
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <url>http://repository.jboss.org/maven2</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>seam-docbook-xslt</artifactId>
- </dependency>
- </dependencies>
-
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>seam-docbook-xslt</artifactId>
- <version>1.1.0.GA</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-webdav</artifactId>
- <version>1.0-beta-2</version>
- </extension>
- </extensions>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.1.1</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <distributionManagement>
- <repository>
- <!-- Copy the dist to the local checkout of the JBoss maven2 repo ${maven.repository.root} -->
- <!-- It is anticipated that ${maven.repository.root} be set in user's settings.xml -->
- <!-- todo : replace this with direct svn access once the svnkit providers are available -->
- <id>repository.jboss.org</id>
- <url>file://${maven.repository.root}</url>
- </repository>
- <snapshotRepository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshot Repository</name>
- <url>dav:https://snapshots.jboss.org/maven2</url>
- </snapshotRepository>
- </distributionManagement>
-
-</project>
Copied: doc/tags/webbeans-docbook-xslt-1.1.1.BETA2/pom.xml (from rev 586, doc/trunk/xslt/pom.xml)
===================================================================
--- doc/tags/webbeans-docbook-xslt-1.1.1.BETA2/pom.xml (rev 0)
+++ doc/tags/webbeans-docbook-xslt-1.1.1.BETA2/pom.xml 2008-12-19 18:09:55 UTC (rev 587)
@@ -0,0 +1,91 @@
+<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>
+
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>webbeans-docbook-xslt</artifactId>
+ <packaging>jar</packaging>
+ <version>1.1.1.BETA2</version>
+
+ <name>Web Beans DocBook XSLT</name>
+ <description>
+ The main project to transform DocBook XML into XHTML and other formats for
+ SeamFramework.org Documentation.
+ </description>
+ <url>http://www.seamframework.org</url>
+
+ <scm>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/doc/tags/webbeans-docbook-xs...</developerConnection>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/doc/tags/webbeans-docbook...</connection>
+ </scm>
+
+ <contributors>
+ <contributor>
+ <name>Pete Muir</name>
+ </contributor>
+ <contributor>
+ <name>Mark Newton</name>
+ </contributor>
+ </contributors>
+
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <url>http://repository.jboss.org/maven2</url>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>seam-docbook-xslt</artifactId>
+ </dependency>
+ </dependencies>
+
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>seam-docbook-xslt</artifactId>
+ <version>1.1.0.GA</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-webdav</artifactId>
+ <version>1.0-beta-2</version>
+ </extension>
+ </extensions>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.1.1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <distributionManagement>
+ <repository>
+ <!-- Copy the dist to the local checkout of the JBoss maven2 repo ${maven.repository.root} -->
+ <!-- It is anticipated that ${maven.repository.root} be set in user's settings.xml -->
+ <!-- todo : replace this with direct svn access once the svnkit providers are available -->
+ <id>repository.jboss.org</id>
+ <url>file://${maven.repository.root}</url>
+ </repository>
+ <snapshotRepository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshot Repository</name>
+ <url>dav:https://snapshots.jboss.org/maven2</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+</project>
Copied: doc/tags/webbeans-docbook-xslt-1.1.1.BETA2/src/main/resources/xslt/org/jboss/webbeans/xhtml-single.xsl (from rev 585, doc/trunk/xslt/src/main/resources/xslt/org/jboss/webbeans/xhtml-single.xsl)
===================================================================
--- doc/tags/webbeans-docbook-xslt-1.1.1.BETA2/src/main/resources/xslt/org/jboss/webbeans/xhtml-single.xsl (rev 0)
+++ doc/tags/webbeans-docbook-xslt-1.1.1.BETA2/src/main/resources/xslt/org/jboss/webbeans/xhtml-single.xsl 2008-12-19 18:09:55 UTC (rev 587)
@@ -0,0 +1,16 @@
+<?xml version='1.0'?>
+
+<!--
+ Copyright 2008 JBoss, a division of Red Hat
+ License: LGPL
+ Author: Pete Muir
+ Author: Mark Newton <mark.newton(a)jboss.org>
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+ <xsl:import href="classpath:/xslt/org/jboss/seam/xhtml-single.xsl"/>
+
+ <xsl:param name="use.simplified.author.group" select="0"/>
+
+</xsl:stylesheet>
Copied: doc/tags/webbeans-docbook-xslt-1.1.1.BETA2/src/main/resources/xslt/org/jboss/webbeans/xhtml.xsl (from rev 585, doc/trunk/xslt/src/main/resources/xslt/org/jboss/webbeans/xhtml.xsl)
===================================================================
--- doc/tags/webbeans-docbook-xslt-1.1.1.BETA2/src/main/resources/xslt/org/jboss/webbeans/xhtml.xsl (rev 0)
+++ doc/tags/webbeans-docbook-xslt-1.1.1.BETA2/src/main/resources/xslt/org/jboss/webbeans/xhtml.xsl 2008-12-19 18:09:55 UTC (rev 587)
@@ -0,0 +1,16 @@
+<?xml version='1.0'?>
+
+<!--
+ Copyright 2008 JBoss, a division of Red Hat
+ License: LGPL
+ Author: Pete Muir
+ Author: Mark Newton <mark.newton(a)jboss.org>
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+ <xsl:import href="classpath:/xslt/org/jboss/seam/xhtml.xsl"/>
+
+ <xsl:param name="use.simplified.author.group" select="0"/>
+
+</xsl:stylesheet>
16 years, 1 month
[webbeans-commits] Webbeans SVN: r585 - doc/trunk/xslt/src/main/resources/xslt/org/jboss/webbeans.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-19 13:08:24 -0500 (Fri, 19 Dec 2008)
New Revision: 585
Added:
doc/trunk/xslt/src/main/resources/xslt/org/jboss/webbeans/xhtml-single.xsl
doc/trunk/xslt/src/main/resources/xslt/org/jboss/webbeans/xhtml.xsl
Log:
Fix the html too
Added: doc/trunk/xslt/src/main/resources/xslt/org/jboss/webbeans/xhtml-single.xsl
===================================================================
--- doc/trunk/xslt/src/main/resources/xslt/org/jboss/webbeans/xhtml-single.xsl (rev 0)
+++ doc/trunk/xslt/src/main/resources/xslt/org/jboss/webbeans/xhtml-single.xsl 2008-12-19 18:08:24 UTC (rev 585)
@@ -0,0 +1,16 @@
+<?xml version='1.0'?>
+
+<!--
+ Copyright 2008 JBoss, a division of Red Hat
+ License: LGPL
+ Author: Pete Muir
+ Author: Mark Newton <mark.newton(a)jboss.org>
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+ <xsl:import href="classpath:/xslt/org/jboss/seam/xhtml-single.xsl"/>
+
+ <xsl:param name="use.simplified.author.group" select="0"/>
+
+</xsl:stylesheet>
Property changes on: doc/trunk/xslt/src/main/resources/xslt/org/jboss/webbeans/xhtml-single.xsl
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: doc/trunk/xslt/src/main/resources/xslt/org/jboss/webbeans/xhtml.xsl
===================================================================
--- doc/trunk/xslt/src/main/resources/xslt/org/jboss/webbeans/xhtml.xsl (rev 0)
+++ doc/trunk/xslt/src/main/resources/xslt/org/jboss/webbeans/xhtml.xsl 2008-12-19 18:08:24 UTC (rev 585)
@@ -0,0 +1,16 @@
+<?xml version='1.0'?>
+
+<!--
+ Copyright 2008 JBoss, a division of Red Hat
+ License: LGPL
+ Author: Pete Muir
+ Author: Mark Newton <mark.newton(a)jboss.org>
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+ <xsl:import href="classpath:/xslt/org/jboss/seam/xhtml.xsl"/>
+
+ <xsl:param name="use.simplified.author.group" select="0"/>
+
+</xsl:stylesheet>
Property changes on: doc/trunk/xslt/src/main/resources/xslt/org/jboss/webbeans/xhtml.xsl
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 1 month