Menu
▾
▴
andromdaplugins-cvs — Each commit to the project CVS repository posts a message to this mailing list.
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(6) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(178) |
Feb
(169) |
Mar
(286) |
Apr
(117) |
May
(98) |
Jun
(68) |
Jul
(63) |
Aug
(121) |
Sep
(88) |
Oct
(124) |
Nov
(2) |
Dec
(111) |
| 2007 |
Jan
(224) |
Feb
(69) |
Mar
(10) |
Apr
(72) |
May
(7) |
Jun
(21) |
Jul
(33) |
Aug
(35) |
Sep
(12) |
Oct
(22) |
Nov
(5) |
Dec
(6) |
| 2008 |
Jan
(2) |
Feb
(10) |
Mar
(39) |
Apr
(58) |
May
(34) |
Jun
(9) |
Jul
(27) |
Aug
(10) |
Sep
(3) |
Oct
|
Nov
|
Dec
|
|
From: Manish A. <mag...@us...> - 2007-02-19 06:32:10
|
User: magrawal Date: 07/02/18 22:32:12 plugins/etc/andromda-dotnet/AndroMDA.ScenarioUnit/samples/Lib - New directory |
|
From: Manish A. <mag...@us...> - 2007-02-19 06:31:08
|
User: magrawal Date: 07/02/18 22:31:07 plugins/etc/andromda-dotnet/AndroMDA.ScenarioUnit/samples - New directory |
|
From: Vance K. <va...@us...> - 2007-02-18 10:43:08
|
User: vancek
Date: 07/02/18 02:43:08
Modified: andromda-ejb3/src/site changes.xml
Log:
fix default subscription durability for topics - set as NonDurable
Revision Changes Path
1.11 +4 -0 cartridges/andromda-ejb3/src/site/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/changes.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- changes.xml 17 Feb 2007 14:09:08 -0000 1.10
+++ changes.xml 18 Feb 2007 10:43:08 -0000 1.11
@@ -386,6 +386,10 @@
Also added 2 constraints to the EJB3EntityFacade class. These constraints override
the default identifier check and generalization check constraints in the parent Entity metafacade.
</action>
+ <action dev="vancek" due-to="Wzzl" type="fix">
+ Set default topic subscription durability as NonDurable in case a Topic does not have the subscription
+ durability TV modelled.
+ </action>
</release>
</body>
</document>
\ No newline at end of file
|
|
From: Vance K. <va...@us...> - 2007-02-18 10:40:43
|
User: vancek
Date: 07/02/18 02:40:43
Modified: andromda-ejb3/src/main/resources/META-INF/andromda
namespace.xml metafacades.xml
andromda-ejb3/src/test/uml EJB3CartridgeTestModel.xml.zip
andromda-ejb3/src/test/expected cartridge-output.zip
andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3MessageDrivenFacadeLogicImpl.java
Log:
fix default subscription durability for topics - set as NonDurable
Revision Changes Path
1.37 +11 -0 cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/namespace.xml
Index: namespace.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/namespace.xml,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -w -r1.36 -r1.37
--- namespace.xml 13 Feb 2007 02:41:40 -0000 1.36
+++ namespace.xml 18 Feb 2007 10:40:41 -0000 1.37
@@ -677,6 +677,17 @@
</ul>
</documentation>
</property>
+ <property name="messageDrivenTopicSubscriptionDurability">
+ <default>NonDurable</default>
+ <documentation>
+ The default topic subscription durability.
+ Possible values are:
+ <ul>
+ <li>Durable</li>
+ <li>NonDurable</li>
+ </ul>
+ </documentation>
+ </property>
</propertyGroup>
<propertyGroup name="Entity Properties">
<property name="entityViewType">
1.31 +1 -0 cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/metafacades.xml
Index: metafacades.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/metafacades.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -w -r1.30 -r1.31
--- metafacades.xml 17 Feb 2007 14:09:08 -0000 1.30
+++ metafacades.xml 18 Feb 2007 10:40:41 -0000 1.31
@@ -223,6 +223,7 @@
<property reference="messageDrivenImplementationNamePattern"/>
<property reference="messageDrivenListenerNamePattern"/>
<property reference="messageDrivenDestinationType"/>
+ <property reference="messageDrivenTopicSubscriptionDurability"/>
<property reference="messageDrivenTestNamePattern"/>
<property reference="messageDrivenTestPackageNamePattern"/>
</metafacade>
1.5 +264 -262 cartridges/andromda-ejb3/src/test/uml/EJB3CartridgeTestModel.xml.zip
<<Binary file>>
1.6 +463 -452 cartridges/andromda-ejb3/src/test/expected/cartridge-output.zip
<<Binary file>>
1.13 +17 -6 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3MessageDrivenFacadeLogicImpl.java
Index: EJB3MessageDrivenFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3MessageDrivenFacadeLogicImpl.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- EJB3MessageDrivenFacadeLogicImpl.java 11 Feb 2007 14:06:37 -0000 1.12
+++ EJB3MessageDrivenFacadeLogicImpl.java 18 Feb 2007 10:40:43 -0000 1.13
@@ -31,7 +31,13 @@
/**
* The property which stores the default destination type
*/
- public static final String MDB_DESTINATION_TYPE = "messageDrivenDestinationType";
+ public static final String MESSAGE_DRIVEN_DESTINATION_TYPE = "messageDrivenDestinationType";
+
+ /**
+ * The property which stores the default subscription durability for a Topic
+ */
+ public static final String MESSAGE_DRIVEN_TOPIC_SUBSCRIPTION_DURABILITY =
+ "messageDrivenTopicSubscriptionDurability";
/**
* The property which stores the pattern defining the JMS message driven bean name.
@@ -97,7 +103,7 @@
String destinationType = (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_EJB_MDB_DESTINATION_TYPE);
if (StringUtils.isBlank(destinationType))
{
- destinationType = (String)this.getConfiguredProperty(MDB_DESTINATION_TYPE);
+ destinationType = (String)this.getConfiguredProperty(MESSAGE_DRIVEN_DESTINATION_TYPE);
}
/**
@@ -262,12 +268,17 @@
*/
protected java.lang.String handleGetSubscriptionDurability()
{
- String durability = null;
- if (StringUtils.equalsIgnoreCase(getDestinationType(), EJB3Globals.MDB_DESTINATION_TYPE_TOPIC))
+ String subscriptionDurability = null;
+ if (this.isDestinationTypeTopic())
{
- durability = (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_EJB_MDB_DURABILITY);
+ subscriptionDurability = String.valueOf(
+ this.getConfiguredProperty(MESSAGE_DRIVEN_TOPIC_SUBSCRIPTION_DURABILITY));
+ if (this.findTaggedValue(EJB3Profile.TAGGEDVALUE_EJB_MDB_DURABILITY) != null)
+ {
+ subscriptionDurability = (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_EJB_MDB_DURABILITY);
+ }
}
- return durability;
+ return subscriptionDurability;
}
/**
|
|
From: Vance K. <va...@us...> - 2007-02-17 14:09:08
|
User: vancek
Date: 07/02/17 06:09:09
Modified: andromda-ejb3/src/test/uml EJB3CartridgeTestModel.xml.zip
andromda-ejb3/src/test/expected cartridge-output.zip
andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3EntityFacadeLogicImpl.java
andromda-ejb3/src/main/resources/META-INF/andromda
cartridge.xml metafacades.xml
andromda-ejb3/src/main/resources/templates/ejb3
EntityEmbeddable.vsl
andromda-ejb3/src/site/resources/howto HowToPictures.zip
HowToModel.xml.zip
andromda-ejb3/src/site changes.xml
andromda-ejb3/src/main/uml EJB3MetafacadeModel.xml.zip
andromda-ejb3/src/site/axdoc howto9.xml
Added: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3MappedSuperclassFacadeLogicImpl.java
EJB3MappedSuperclassAttributeFacadeLogicImpl.java
Log:
add EJB3MappedSuperclassFacade and EJB3MappedSuperclassAttributeFacade metafacades. No longer need to model an Entity stereotype with a MappedSuperclass stereotype on the parent class. reflect changes in docs and override validation constraints.
Revision Changes Path
1.4 +259 -262 cartridges/andromda-ejb3/src/test/uml/EJB3CartridgeTestModel.xml.zip
<<Binary file>>
1.5 +450 -449 cartridges/andromda-ejb3/src/test/expected/cartridge-output.zip
<<Binary file>>
1.29 +47 -3 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java
Index: EJB3EntityFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -w -r1.28 -r1.29
--- EJB3EntityFacadeLogicImpl.java 17 Jan 2007 00:50:55 -0000 1.28
+++ EJB3EntityFacadeLogicImpl.java 17 Feb 2007 14:09:07 -0000 1.29
@@ -17,6 +17,7 @@
import org.andromda.metafacades.uml.AttributeFacade;
import org.andromda.metafacades.uml.ClassifierFacade;
import org.andromda.metafacades.uml.DependencyFacade;
+import org.andromda.metafacades.uml.Entity;
import org.andromda.metafacades.uml.EntityAssociationEnd;
import org.andromda.metafacades.uml.EntityAttribute;
import org.andromda.metafacades.uml.EnumerationFacade;
@@ -220,9 +221,9 @@
}
// No PK dependency found - try a PK attribute
- if (super.getIdentifiers() != null && !super.getIdentifiers().isEmpty())
+ if (this.getIdentifiers(true) != null && !this.getIdentifiers(true).isEmpty())
{
- AttributeFacade attr = (AttributeFacade)super.getIdentifiers().iterator().next();
+ AttributeFacade attr = (AttributeFacade)this.getIdentifiers(true).iterator().next();
identifiers.add(attr);
return identifiers;
}
@@ -233,6 +234,49 @@
}
/**
+ * This overrides the default implementation in EntityLogicImpl.java.
+ *
+ * This provides the means to check super classes, even those modelled
+ * as mapped superclasses, as well as entities.
+ *
+ * Gets all identifiers for this entity. If 'follow' is true, and if
+ * no identifiers can be found on the entity, a search up the
+ * inheritance chain will be performed, and the identifiers from
+ * the first super class having them will be used.
+ *
+ * @param follow a flag indicating whether or not the inheritance hiearchy
+ * should be followed
+ * @return the collection of identifiers.
+ */
+ public Collection getIdentifiers(boolean follow)
+ {
+ final Collection identifiers = new ArrayList(this.getAttributes());
+ MetafacadeUtils.filterByStereotype(
+ identifiers,
+ UMLProfile.STEREOTYPE_IDENTIFIER);
+
+ if (identifiers.isEmpty() && follow)
+ {
+ if (this.getGeneralization() instanceof EJB3EntityFacade)
+ {
+ return ((EJB3EntityFacade)this.getGeneralization()).getIdentifiers(follow);
+ }
+ else if (this.getGeneralization() instanceof EJB3MappedSuperclassFacade)
+ {
+ return ((EJB3MappedSuperclassFacade)this.getGeneralization()).getIdentifiers(follow);
+ }
+ else
+ {
+ return identifiers;
+ }
+ }
+ else
+ {
+ return identifiers;
+ }
+ }
+
+ /**
* @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacade#isSyntheticCreateMethodAllowed()
*/
protected boolean handleIsSyntheticCreateMethodAllowed()
@@ -1074,7 +1118,7 @@
if (displayAttribute == null)
{
- if (!getIdentifiers().isEmpty())
+ if (!this.getIdentifiers().isEmpty())
{
displayAttribute = (EntityAttribute)this.getIdentifiers().iterator().next();
}
1.1 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3MappedSuperclassFacadeLogicImpl.java
Index: EJB3MappedSuperclassFacadeLogicImpl.java
===================================================================
package org.andromda.cartridges.ejb3.metafacades;
/**
* MetafacadeLogic implementation for org.andromda.cartridges.ejb3.metafacades.EJB3MappedSuperclassFacade.
*
* @see org.andromda.cartridges.ejb3.metafacades.EJB3MappedSuperclassFacade
*/
public class EJB3MappedSuperclassFacadeLogicImpl
extends EJB3MappedSuperclassFacadeLogic
{
public EJB3MappedSuperclassFacadeLogicImpl (Object metaObject, String context)
{
super (metaObject, context);
}
}
1.1 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3MappedSuperclassAttributeFacadeLogicImpl.java
Index: EJB3MappedSuperclassAttributeFacadeLogicImpl.java
===================================================================
package org.andromda.cartridges.ejb3.metafacades;
/**
* MetafacadeLogic implementation for org.andromda.cartridges.ejb3.metafacades.EJB3MappedSuperclassAttributeFacade.
*
* @see org.andromda.cartridges.ejb3.metafacades.EJB3MappedSuperclassAttributeFacade
*/
public class EJB3MappedSuperclassAttributeFacadeLogicImpl
extends EJB3MappedSuperclassAttributeFacadeLogic
{
public EJB3MappedSuperclassAttributeFacadeLogicImpl (Object metaObject, String context)
{
super (metaObject, context);
}
}
1.37 +0 -1 cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/cartridge.xml
Index: cartridge.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/cartridge.xml,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -w -r1.36 -r1.37
--- cartridge.xml 13 Feb 2007 02:41:40 -0000 1.36
+++ cartridge.xml 17 Feb 2007 14:09:08 -0000 1.37
@@ -157,7 +157,6 @@
<modelElement variable="persistenceContexts">
<type name="org.andromda.cartridges.ejb3.metafacades.EJB3PersistenceContextFacade"/>
</modelElement>
-
</modelElements>
</template>
1.30 +15 -0 cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/metafacades.xml
Index: metafacades.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/metafacades.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -w -r1.29 -r1.30
--- metafacades.xml 11 Feb 2007 14:06:34 -0000 1.29
+++ metafacades.xml 17 Feb 2007 14:09:08 -0000 1.30
@@ -81,6 +81,21 @@
</mapping>
</metafacade>
+ <!-- Mapped Superclass Metafacades -->
+ <metafacade class="org.andromda.cartridges.ejb3.metafacades.EJB3MappedSuperclassFacadeLogicImpl" contextRoot="true">
+ <mapping>
+ <stereotype>MAPPED_SUPERCLASS</stereotype>
+ </mapping>
+ </metafacade>
+ <metafacade class="org.andromda.cartridges.ejb3.metafacades.EJB3MappedSuperclassAttributeFacadeLogicImpl">
+ <mapping>
+ <context>org.andromda.cartridges.ejb3.metafacades.EJB3MappedSuperclassFacade</context>
+ </mapping>
+ <property reference="entityDefaultGeneratorType"/>
+ <property reference="entityDefaultGeneratorInitialValue"/>
+ <property reference="entityDefaultGeneratorAllocationSize"/>
+ </metafacade>
+
<!-- WebService Metafacades -->
<metafacade class="org.andromda.cartridges.ejb3.metafacades.EJB3WebServiceFacadeLogicImpl" contextRoot="true">
<mapping>
1.44 +28 -3 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EntityEmbeddable.vsl
Index: EntityEmbeddable.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EntityEmbeddable.vsl,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -w -r1.43 -r1.44
--- EntityEmbeddable.vsl 17 Jan 2007 00:50:56 -0000 1.43
+++ EntityEmbeddable.vsl 17 Feb 2007 14:09:08 -0000 1.44
@@ -826,11 +826,36 @@
#else
#**##set ($entityName = $entity.entityName)
#end
-#renderEqualsMethod($entity $entityName $entity.identifiers)
+##
+## This was changed when the EJB3MappedSuperclassFacade was introduced.
+## If normal entity, use identifier attributes
+## If mapped superclass there are 2 options
+## If an identifier has been explicity defined, then use the identifier
+## If an identifier has been dynamically created, then use normal attributes and not the identifier
+##
+#if (${entity.embeddableSuperclass})
+#**##if ($entity.dynamicIdentifiersPresent)
+#* *##set ($attributeSet = ${updatableAttributes})
+#**##else
+#* *##set ($attributeSet = ${entity.identifiers})
+#**##end
+#else
+#**##set ($attributeSet = ${entity.identifiers})
+#end
+#renderEqualsMethod($entity $entityName $attributeSet)
-#renderHashCodeMethod($entity $entity.identifiers)
+#renderHashCodeMethod($entity $attributeSet)
-#renderToStringMethod($entity $entityName $entity.attributes)
+#if (${entity.embeddableSuperclass})
+#**##if ($entity.dynamicIdentifiersPresent)
+#* *##set ($attributeSet = ${updatableAttributes})
+#**##else
+#* *##set ($attributeSet = ${entity.attributes})
+#**##end
+#else
+#**##set ($attributeSet = ${entity.attributes})
+#end
+#renderToStringMethod($entity $entityName $attributeSet)
#if (!$entity.entityImplementationRequired && !$entity.embeddableSuperclass && !$entity.requiresGeneralizationMapping)
#renderCompareToMethod($entity $entityName $entity.identifiers)
1.2 +197 -150 cartridges/andromda-ejb3/src/site/resources/howto/HowToPictures.zip
<<Binary file>>
1.2 +239 -194 cartridges/andromda-ejb3/src/site/resources/howto/HowToModel.xml.zip
<<Binary file>>
1.10 +9 -0 cartridges/andromda-ejb3/src/site/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/changes.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- changes.xml 12 Feb 2007 02:13:16 -0000 1.9
+++ changes.xml 17 Feb 2007 14:09:08 -0000 1.10
@@ -377,6 +377,15 @@
Resource libs jms-ra.rar and jcainflow.rar are copied to src/test/resources folder of the core project
for testing of message driven test cases.
</action>
+ <action dev="vancek" type="update">
+ Added EJB3MappedSuperclassFacade and EJB3MappedSuperclassAttributeFacade metafacades extending EJB3EntityFacade
+ and EJB3EntityAttributeFacade respectively. This enables the ability to model a mapped superclass by modelling
+ only the MappedSuperclass stereotype. The existing way required the Entity stereotype as well as the
+ MappedSuperclass stereotype. This excludes a mapped superclass in the group of manageable entities, if entities
+ are modelled as Manageable as well.
+ Also added 2 constraints to the EJB3EntityFacade class. These constraints override
+ the default identifier check and generalization check constraints in the parent Entity metafacade.
+ </action>
</release>
</body>
</document>
\ No newline at end of file
1.52 +263 -226 cartridges/andromda-ejb3/src/main/uml/EJB3MetafacadeModel.xml.zip
<<Binary file>>
1.4 +26 -1 cartridges/andromda-ejb3/src/site/axdoc/howto9.xml
Index: howto9.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/axdoc/howto9.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- howto9.xml 19 Jan 2007 14:35:42 -0000 1.3
+++ howto9.xml 17 Feb 2007 14:09:09 -0000 1.4
@@ -106,6 +106,31 @@
guidelines since there is no inheritance hierarchy for this entity. Therefore, only a
<code>Person</code> class is generated and should not be modified.
</p>
+ <p>
+ If you are going to enable manageable entities, you must ONLY enable
+ your identifiers in the subclass and not the parent mapped superclass. Furthermore, you must
+ also disable
+ the following two constraints in your <code>andromda.xml</code> by adding the following
+ <b>constraints</b> section. Rest assured that by disabling these constraints, your are not
+ vulnerable to modelling flaws, since the constraints on the <i>EJB3EntityFacade</i> will
+ enforce these constraints.
+<source language="xml"><![CDATA[
+ <repository name="netBeansMDR">
+ <models>
+ <model>
+ <uri>${model.uri}</uri>
+ <moduleSearchLocations>
+ <location patterns="**/*.xml.zip">${settings.localRepository}/org/andromda/profiles/</location>
+ </moduleSearchLocations>
+ <constraints enforceAll="true">
+ <constraint enforce="false">org::andromda::metafacades::uml::Entity::entities can only generalize other entities</constraint>
+ <constraint enforce="false">org::andromda::metafacades::uml::Entity::entity must have at least one primary key</constraint>
+ </constraints>
+ </model>
+ </models>
+ </repository>
+]]></source>
+ </p>
</subsection>
<a name="Single_Table_Strategy"/>
<subsection name="Single Table Strategy">
|
|
From: Vance K. <va...@us...> - 2007-02-13 02:41:44
|
User: vancek
Date: 07/02/12 18:41:40
Modified: andromda-ejb3/src/main/resources/templates/ejb3/config/jboss
login-config.xml.vsl
andromda-ejb3/src/main/resources/META-INF/andromda
namespace.xml cartridge.xml
andromda-ejb3/conf/test andromda.xml
andromda-ejb3/conf/howto andromda.xml
andromda-ejb3/src/main/resources/templates/ejb3/config
persistence.xml.vsl
andromda-ejb3/src/test/expected cartridge-output.zip
andromda-ejb3/src/main/resources/templates/ejb3/microcontainer
embedded-jboss-beans.xml.vsl
Log:
add support for jdbc properties that now exists in andromda.xml config
Revision Changes Path
1.2 +5 -1 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/config/jboss/login-config.xml.vsl
Index: login-config.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/config/jboss/login-config.xml.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- login-config.xml.vsl 14 Mar 2006 06:14:11 -0000 1.1
+++ login-config.xml.vsl 13 Feb 2007 02:41:40 -0000 1.2
@@ -10,7 +10,11 @@
flag="required">
<module-option name="debug">true</module-option>
<module-option name="unauthenticatedIdentity">guest</module-option>
- <module-option name="dsJndiName">${entityManagerJTADataSource}</module-option>
+ <module-option name="dsJndiName">${dataSource}</module-option>
+ <module-option name="userName">${username}</module-option>
+#if ($stringUtils.isNotBlank(${password}))
+ <module-option name="password">${password}</module-option>
+#end
<module-option name="principalsQuery">
SELECT PASSWORD 'Password' FROM principal WHERE BINARY PRINCIPAL_ID =?
</module-option>
1.36 +32 -1 cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/namespace.xml
Index: namespace.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/namespace.xml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -w -r1.35 -r1.36
--- namespace.xml 11 Feb 2007 14:06:34 -0000 1.35
+++ namespace.xml 13 Feb 2007 02:41:40 -0000 1.36
@@ -237,6 +237,37 @@
in the deployed ear package.
</documentation>
</property>
+ <property name="driver" required="false">
+ <documentation>
+ JDBC Driver to make a database connection.
+ </documentation>
+ </property>
+ <property name="username" required="false">
+ <documentation>
+ The database user login name.
+ </documentation>
+ </property>
+ <property name="password" required="false">
+ <documentation>
+ The database user password.
+ </documentation>
+ </property>
+ <property name="connectionUrl" required="false">
+ <documentation>
+ URL for the JDBC Driver to make the connection to the database.
+ </documentation>
+ </property>
+ <property name="dataSource" required="false">
+ <documentation>
+ Full JNDI name of data source to use. (would be used instead
+ of the connection properties, driver, username, password, etc).
+ </documentation>
+ </property>
+ <property name="dataSourceName" required="false">
+ <documentation>
+ The JNDI name of data source to use without prefix like java:/.
+ </documentation>
+ </property>
</propertyGroup>
<propertyGroup name="Cache">
<property name="hibernateCacheProvider" required="false">
1.36 +6 -1 cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/cartridge.xml
Index: cartridge.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/cartridge.xml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -w -r1.35 -r1.36
--- cartridge.xml 12 Feb 2007 02:07:46 -0000 1.35
+++ cartridge.xml 13 Feb 2007 02:41:40 -0000 1.36
@@ -16,8 +16,13 @@
<!-- cartridge-templateObject merge-point-->
+ <property reference="driver"/>
+ <property reference="username"/>
+ <property reference="password"/>
+ <property reference="connectionUrl"/>
+ <property reference="dataSource"/>
+ <property reference="dataSourceName"/>
<property reference="entityManagerName"/>
- <property reference="entityManagerJTADataSource"/>
<property reference="hibernateHbm2DDLAuto"/>
<property reference="hibernateDialect"/>
<property reference="hibernateShowSql"/>
1.3 +6 -1 cartridges/andromda-ejb3/conf/test/andromda.xml
Index: andromda.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/conf/test/andromda.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- andromda.xml 7 Feb 2007 04:28:44 -0000 1.2
+++ andromda.xml 13 Feb 2007 02:41:40 -0000 1.3
@@ -43,6 +43,12 @@
<namespace name="ejb3">
<properties>
<property name="overwrite">true</property>
+ <property name="dataSourceName">DefaultDS</property>
+ <property name="dataSource">java:/DefaultDS</property>
+ <property name="username">auser</property>
+ <property name="password">apassword</property>
+ <property name="driver">a.driver.Class</property>
+ <property name="connectionUrl">a:connection:url</property>
<property name="mergeMappingsUri">file:${test.src.dir}/mappings/MergeMappings.xml</property>
<property name="value-objects">${test.output.dir}</property>
<property name="entity-beans">${test.output.dir}</property>
@@ -67,7 +73,6 @@
<property name="persistenceContainerName">jboss</property>
<property name="persistenceContextUnitName">ejb3test</property>
<property name="entityManagerName">ejb3test</property>
- <property name="entityManagerJTADataSource">java:/DefaultDS</property>
<property name="hibernateDialect">net.sf.hibernate.dialect.HSQLDialect</property>
<property name="hibernateHbm2DDLAuto">update</property>
<property name="enableTemplating">true</property>
1.3 +6 -1 cartridges/andromda-ejb3/conf/howto/andromda.xml
Index: andromda.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/conf/howto/andromda.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- andromda.xml 4 Feb 2007 04:18:19 -0000 1.2
+++ andromda.xml 13 Feb 2007 02:41:40 -0000 1.3
@@ -39,6 +39,12 @@
</namespace>
<namespace name="ejb3">
<properties>
+ <property name="dataSourceName">jdbc/howtomodel</property>
+ <property name="dataSource">java:/jdbc/howtomodel</property>
+ <property name="username">auser</property>
+ <property name="password">apassword</property>
+ <property name="driver">com.mysql.jdbc.Driver</property>
+ <property name="connectionUrl">jdbc:mysql://localhost:3306/howtomodel</property>
<property name="entity-beans">${howto.output.dir}</property>
<property name="entity-impls">${howto.output.dir}</property>
<property name="entity-config">${howto.output.dir}</property>
@@ -61,7 +67,6 @@
<property name="persistenceContainerName">jboss</property>
<property name="persistenceContextUnitName">howtomodel</property>
<property name="entityManagerName">howtomodel</property>
- <property name="entityManagerJTADataSource">java:/jdbc/howtomodel</property>
<property name="hibernateDialect">net.sf.hibernate.dialect.HSQLDialect</property>
<property name="hibernateHbm2DDLAuto">update</property>
<property name="enableTemplating">true</property>
1.4 +3 -3 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/config/persistence.xml.vsl
Index: persistence.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/config/persistence.xml.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- persistence.xml.vsl 14 Jun 2006 08:08:47 -0000 1.3
+++ persistence.xml.vsl 13 Feb 2007 02:41:40 -0000 1.4
@@ -14,8 +14,8 @@
version="1.0">
-->
<persistence-unit name="${entityManagerName}">
-#if ($stringUtils.isNotBlank($entityManagerJTADataSource))
- <jta-data-source>${entityManagerJTADataSource}</jta-data-source>
+#if ($stringUtils.isNotBlank(${dataSource}))
+ <jta-data-source>${dataSource}</jta-data-source>
#end
#if ($stringUtils.isNotBlank($jarFiles))
#**##set ($jars = $stringUtils.split($jarFiles,','))
@@ -83,7 +83,7 @@
</persistence-unit>
#foreach ($persistenceContext in $persistenceContexts)
<persistence-unit name="${persistenceContext.unitName}">
-#**##if ($stringUtils.isNotBlank($entityManagerJTADataSource))
+#**##if ($stringUtils.isNotBlank(${persistenceContext.datasource}))
<jta-data-source>${persistenceContext.datasource}</jta-data-source>
#**##end
<properties>
1.4 +451 -458 cartridges/andromda-ejb3/src/test/expected/cartridge-output.zip
<<Binary file>>
1.2 +9 -7 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/microcontainer/embedded-jboss-beans.xml.vsl
Index: embedded-jboss-beans.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/microcontainer/embedded-jboss-beans.xml.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- embedded-jboss-beans.xml.vsl 4 Feb 2007 02:45:05 -0000 1.1
+++ embedded-jboss-beans.xml.vsl 13 Feb 2007 02:41:40 -0000 1.2
@@ -92,13 +92,15 @@
</constructor>
</bean>
-#if ($stringUtils.isNotBlank(${entityManagerName}))
+#if ($stringUtils.isNotBlank(${dataSource}))
<bean name="${entityManagerName}DatasourceBootstrap" class="org.jboss.resource.adapter.jdbc.local.LocalTxDataSource">
- <property name="driverClass">com.mysql.jdbc.Driver</property>
- <property name="connectionURL">jdbc:mysql://localhost:3306/${entityManagerName}</property>
- <!-- <property name="connectionURL">jdbc:hsqldb:./hypersonic/localDB</property> -->
- <property name="userName">sa</property>
- <property name="jndiName">java:/jdbc/${entityManagerName}</property>
+ <property name="driverClass">${driver}</property>
+ <property name="connectionURL">${connectionUrl}</property>
+ <property name="userName">${username}</property>
+#**##if ($stringUtils.isNotBlank(${password}))
+ <property name="password">${password}</property>
+#**##end
+ <property name="jndiName">${dataSource}</property>
<property name="minSize">0</property>
<property name="maxSize">10</property>
<property name="blockingTimeout">1000</property>
@@ -108,7 +110,7 @@
<property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
</bean>
- <bean name="jdbc/${entityManagerName}" class="java.lang.Object">
+ <bean name="${dataSourceName}" class="java.lang.Object">
<constructor factoryMethod="getDatasource">
<factory bean="${entityManagerName}DatasourceBootstrap"/>
</constructor>
|
|
From: Vance K. <va...@us...> - 2007-02-13 02:39:22
|
User: vancek
Date: 07/02/12 18:39:19
Modified: andromda-ejb3/src/main/resources/templates/ejb3/test
EJB3Container.vsl
Log:
fix jms specific xml resources loaded if MDBs exist
Revision Changes Path
1.3 +1 -1 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/test/EJB3Container.vsl
Index: EJB3Container.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/test/EJB3Container.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- EJB3Container.vsl 11 Feb 2007 14:06:32 -0000 1.2
+++ EJB3Container.vsl 13 Feb 2007 02:39:19 -0000 1.3
@@ -59,7 +59,7 @@
// logger.info("==>Deployed security-beans");
#end
-#if (!$mdbs.empty())
+#if (!$mdbs.isEmpty())
logger.info("==>Deploying jboss-jms-beans - init JBoss MQ core services");
EJB3StandaloneBootstrap.deployXmlResource("jboss-jms-beans.xml");
logger.info("==>Deployed jboss-jms-beans");
|
|
From: Vance K. <va...@us...> - 2007-02-13 02:38:24
|
User: vancek
Date: 07/02/12 18:38:22
Modified: andromda-ejb3/src/main/resources/templates/ejb3/test
testng.xml.vsl
Log:
add the EJB3Container class if message driven tests exist
Revision Changes Path
1.4 +1 -1 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/test/testng.xml.vsl
Index: testng.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/test/testng.xml.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- testng.xml.vsl 11 Feb 2007 14:06:33 -0000 1.3
+++ testng.xml.vsl 13 Feb 2007 02:38:22 -0000 1.4
@@ -8,7 +8,7 @@
#else
#**##set ($testPackage = "")
#end
-#if (!$services.isEmpty())
+#if (!$services.isEmpty() || !$mdbs.isEmpty())
<!-- Always start the EJB3 embeddable container before running the tests -->
<class name="${testPackage}EJB3Container"/>
#end
|
|
From: Leif J. <le...@us...> - 2007-02-12 18:57:30
|
User: leifj
Date: 07/02/12 10:57:29
Modified: andromda-jsf2/src/main/resources/templates/jsf2/utils
NavigationItem.java.vsl
Log:
roles to private
Revision Changes Path
1.3 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/utils/NavigationItem.java.vsl
Index: NavigationItem.java.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/utils/NavigationItem.java.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- NavigationItem.java.vsl 12 Feb 2007 16:54:56 -0000 1.2
+++ NavigationItem.java.vsl 12 Feb 2007 18:57:28 -0000 1.3
@@ -24,7 +24,7 @@
private Object controllerBean = null;
private String controllerAction = null;
private String roles = null;
- protected String[] _roles = null;
+ private String[] _roles = null;
public NavigationItem() {}
|
|
From: Leif J. <le...@us...> - 2007-02-12 16:55:00
|
User: leifj
Date: 07/02/12 08:54:56
Modified: andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades
JSFUseCaseLogicImpl.java
andromda-jsf2/src/main/resources/resources/configuration/facelets
andromda.taglib.xml
andromda-jsf2/src/main/resources/templates/jsf2/configuration
faces-config.xml.vsl
andromda-jsf2/src/main/resources/templates/jsf2/utils
NavigationItem.java.vsl
andromda-jsf2/src/main/uml JSFMetafacadeModel.xml.zip
Added: andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/taglib
PermissionChecker.java RoleAssociated.java
Log:
conditionally render navigation-items based on roles - we must fix this for manageable entities too\!
Revision Changes Path
1.1 cartridges/andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/taglib/PermissionChecker.java
Index: PermissionChecker.java
===================================================================
/*
* Created on Feb 12, 2007
*
*/
package org.andromda.cartridges.jsf2.taglib;
public class PermissionChecker {
public static boolean isUserInItemRoles(RoleAssociated item) {
String[] roles = item.getAssociatedRoles();
if (roles == null || roles.length == 0) // no constraints at all
return true;
javax.faces.context.ExternalContext ctx = javax.faces.context.FacesContext.getCurrentInstance().getExternalContext();
if (ctx.getUserPrincipal() == null) // not logged in
return false;
for (int i = 0; i < roles.length; i++)
{
String role = roles[i];
if (ctx.isUserInRole(role))
return true;
}
return false;
}
}
1.1 cartridges/andromda-jsf2/components/src/main/java/org/andromda/cartridges/jsf2/taglib/RoleAssociated.java
Index: RoleAssociated.java
===================================================================
/*
* Created on Feb 12, 2007
*
*/
package org.andromda.cartridges.jsf2.taglib;
public interface RoleAssociated {
public String[] getAssociatedRoles();
}
1.2 +24 -0 cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFUseCaseLogicImpl.java
Index: JSFUseCaseLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFUseCaseLogicImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- JSFUseCaseLogicImpl.java 5 Dec 2006 19:39:09 -0000 1.1
+++ JSFUseCaseLogicImpl.java 12 Feb 2007 16:54:55 -0000 1.2
@@ -28,6 +28,7 @@
import org.apache.commons.collections.Transformer;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
+import org.andromda.metafacades.uml.Role;
/**
@@ -754,4 +755,27 @@
});
}
+ /**
+ * @see org.andromda.cartridges.jsf2.metafacades.JSFUseCase#getActionRoles()
+ */
+ protected String handleGetActionRoles()
+ {
+ final Collection users = this.getRoles();
+ final StringBuffer rolesBuffer = new StringBuffer();
+ boolean first = true;
+ for (final Iterator userIterator = users.iterator(); userIterator.hasNext();)
+ {
+ if (first)
+ {
+ first = false;
+ }
+ else
+ {
+ rolesBuffer.append(',');
+ }
+ final Role role = (Role)userIterator.next();
+ rolesBuffer.append(role.getName());
+ }
+ return rolesBuffer.toString();
+ }
}
1.2 +6 -0 cartridges/andromda-jsf2/src/main/resources/resources/configuration/facelets/andromda.taglib.xml
Index: andromda.taglib.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/resources/configuration/facelets/andromda.taglib.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- andromda.taglib.xml 5 Dec 2006 19:39:34 -0000 1.1
+++ andromda.taglib.xml 12 Feb 2007 16:54:55 -0000 1.2
@@ -45,4 +45,10 @@
</component>
</tag>
+ <function>
+ <function-name>isUserInItemRoles</function-name>
+ <function-class>org.andromda.cartridges.jsf2.taglib.PermissionChecker</function-class>
+ <function-signature>boolean isUserInItemRoles(org.andromda.cartridges.jsf2.taglib.RoleAssociated)</function-signature>
+ </function>
+
</facelet-taglib>
1.6 +8 -0 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/faces-config.xml.vsl
Index: faces-config.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/faces-config.xml.vsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- faces-config.xml.vsl 1 Feb 2007 19:46:51 -0000 1.5
+++ faces-config.xml.vsl 12 Feb 2007 16:54:55 -0000 1.6
@@ -83,6 +83,14 @@
<property-name>controllerAction</property-name>
<value>${useCase.controllerAction}</value>
</managed-property>
+#set ($roles = $useCase.actionRoles)
+#set ($securityEnabled = $stringUtils.isNotBlank($securityRealm) && $stringUtils.isNotBlank($roles) )
+#if ($securityEnabled)
+ <managed-property>
+ <property-name>roles</property-name>
+ <value>$roles</value>
+ </managed-property>
+#end
<managed-property>
<property-name>outcome</property-name>
<value>$useCase.forwardName</value>
1.2 +31 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/utils/NavigationItem.java.vsl
Index: NavigationItem.java.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/utils/NavigationItem.java.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- NavigationItem.java.vsl 5 Dec 2006 19:39:21 -0000 1.1
+++ NavigationItem.java.vsl 12 Feb 2007 16:54:56 -0000 1.2
@@ -6,13 +6,14 @@
import java.util.List;
import java.lang.StringBuffer;
import org.apache.commons.beanutils.MethodUtils;
+import javax.servlet.http.HttpServletRequest;
/**
*
* @author Leif Johansson
*/
public class $className
- implements java.io.Serializable
+ implements java.io.Serializable, org.andromda.cartridges.jsf2.taglib.RoleAssociated
{
private String label = null;
@@ -22,6 +23,8 @@
private List children = null;
private Object controllerBean = null;
private String controllerAction = null;
+ private String roles = null;
+ protected String[] _roles = null;
public NavigationItem() {}
@@ -65,6 +68,32 @@
this.icon = icon;
}
+ public String getRoles() {
+ return roles;
+ }
+
+ private void _updateRoles() {
+ if (roles != null && roles.length() > 0)
+ _roles = roles.split(",");
+ else
+ _roles = null;
+ }
+
+ public void setRoles(String roles) {
+ this.roles = roles;
+ _updateRoles();
+ }
+
+ public String[] getAssociatedRoles()
+ {
+ return _roles;
+ }
+
+ public boolean isRendered()
+ {
+ return org.andromda.cartridges.jsf2.taglib.PermissionChecker.isUserInItemRoles(this);
+ }
+
public String getAction() {
try {
return (java.lang.String)MethodUtils.invokeMethod(getControllerBean(),getControllerAction(),null);
@@ -96,6 +125,7 @@
buf.append("label=").append(label);
buf.append(",outcome=").append(outcome);
buf.append(",viewId=").append(viewId);
+ buf.append(",roles=").append(roles);
if (children != null)
buf.append(",children=").append(children);
buf.append("]");
1.3 +185 -180 cartridges/andromda-jsf2/src/main/uml/JSFMetafacadeModel.xml.zip
<<Binary file>>
|
|
From: Leif J. <le...@us...> - 2007-02-12 11:00:20
|
User: leifj
Date: 07/02/12 03:00:19
Modified: andromda-jsf2/src/main/resources/templates/jsf2/configuration
web.xml.vsl
Log:
removed duplicates
Revision Changes Path
1.6 +2 -15 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/web.xml.vsl
Index: web.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/web.xml.vsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- web.xml.vsl 18 Jan 2007 10:11:09 -0000 1.5
+++ web.xml.vsl 12 Feb 2007 11:00:19 -0000 1.6
@@ -392,21 +392,6 @@
</security-constraint>
#end
- <!-- <login-config>
- <auth-method>FORM</auth-method>
- <realm-name>$securityRealm</realm-name>
- <form-login-config>
- <form-login-page>/${loginFileName}.${facesServletExtension}</form-login-page>
- <form-error-page>/${loginFileName}.${facesServletExtension}?action=error</form-error-page>
- </form-login-config>
- </login-config> -->
-
-#foreach ($user in $applicationUseCase.allRoles)
- <security-role>
- <role-name>$user.name</role-name>
- </security-role>
-#end
- <!-- security-role merge-point -->
#end
#foreach ($manageable in $manageables)
@@ -447,5 +432,7 @@
</security-role>
#end
+ <!-- security-role merge-point -->
+
#end
</web-app>
|
|
From: Vance K. <va...@us...> - 2007-02-12 02:37:32
|
User: vancek
Date: 07/02/11 18:37:31
Modified: andromda-ejb3/src/site/fml faq.fml
Log:
add schema creation failure faq
Revision Changes Path
1.7 +13 -0 cartridges/andromda-ejb3/src/site/fml/faq.fml
Index: faq.fml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/fml/faq.fml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- faq.fml 12 Feb 2007 02:13:16 -0000 1.6
+++ faq.fml 12 Feb 2007 02:37:31 -0000 1.7
@@ -123,5 +123,18 @@
</p>
</answer>
</faq>
+ <faq id="Cannot_create_schema_with_andromdapp_schema">
+ <question>Problems creating schema using "mvn -e -f core/pom.xml andromdapp:schema -Dtasks=create"</question>
+ <answer>
+ <p>
+ Once you deploy your ear package to the application server, all necessary schemas will be created
+ for you based on the <b>hibernate.hbm2ddl.auto</b> property in your application's <i>persistence.xml</i>
+ configuration.
+ </p>
+ <p>
+ Have a look at <a href="http://galaxy.andromda.org/forum/viewtopic.php?t=3083">forum reference</a>.
+ </p>
+ </answer>
+ </faq>
</part>
</faqs>
|
|
From: Vance K. <va...@us...> - 2007-02-12 02:13:16
|
User: vancek
Date: 07/02/11 18:13:17
Modified: andromda-ejb3/src/site/fml faq.fml
andromda-ejb3/src/site changes.xml
andromda-ejb3/src/site/axdoc howto22.xml
Log:
add docs for message driven test cases
Revision Changes Path
1.6 +15 -0 cartridges/andromda-ejb3/src/site/fml/faq.fml
Index: faq.fml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/fml/faq.fml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- faq.fml 5 Feb 2007 13:14:51 -0000 1.5
+++ faq.fml 12 Feb 2007 02:13:16 -0000 1.6
@@ -108,5 +108,20 @@
</p>
</answer>
</faq>
+ <faq id="NoSuchMethodError_KernelAbstractionFactory_setKernel_with_Tests">
+ <question>Why am I getting "java.lang.RuntimeException: java.lang.NoSuchMethodError: org.jboss.ejb3.KernelAbstractionFactory.setKernel(Lorg/jboss/kernel/Kernel;)V" when running the test!</question>
+ <answer>
+ <p>
+ This is a classpath issue. The JBoss libs/artifacts that are setup as dependencies in the project
+ contain different versions of the org.jboss.ejb3.KernelAbstractionFactory class.
+ </p>
+ <p>
+ You should be able to safely comment out or remove the <b>jboss-ejb3-client</b> dependency from your
+ dependencies list. This library's version of KernelAbstractionFactory does not contain the
+ <i>kernel</i> attribute. This allows this class to be seen/loaded from the <b>jboss-ejb3-all</b>
+ library.
+ </p>
+ </answer>
+ </faq>
</part>
</faqs>
1.9 +4 -0 cartridges/andromda-ejb3/src/site/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/changes.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- changes.xml 11 Feb 2007 14:06:37 -0000 1.8
+++ changes.xml 12 Feb 2007 02:13:16 -0000 1.9
@@ -373,6 +373,10 @@
<action dev="vancek" type="add">
Add support for MDB testing within embedded EJB3 container. Further customised test templates.
</action>
+ <action dev="vancek" type="add">
+ Resource libs jms-ra.rar and jcainflow.rar are copied to src/test/resources folder of the core project
+ for testing of message driven test cases.
+ </action>
</release>
</body>
</document>
\ No newline at end of file
1.3 +44 -0 cartridges/andromda-ejb3/src/site/axdoc/howto22.xml
Index: howto22.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/axdoc/howto22.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- howto22.xml 5 Feb 2007 00:40:30 -0000 1.2
+++ howto22.xml 12 Feb 2007 02:13:16 -0000 1.3
@@ -73,6 +73,7 @@
<li class="impl"><a class="changed" href="howto/org/andromda/test/roles.properties"><code>roles.properties</code></a></li>
<li class="impl"><a class="changed" href="howto/org/andromda/test/users.properties"><code>users.properties</code></a></li>
<li class="impl"><a class="changed" href="howto/org/andromda/test/testng.xml"><code>testng.xml</code></a></li>
+ <li class="impl"><a class="changed" href="howto/org/andromda/test/testjms.xml"><code>testjms.xml</code></a></li>
</ul>
</p>
<p>
@@ -172,6 +173,49 @@
project or running the tests.
</p>
</subsection>
+ <a name="Message_Driven_Bean_Tests"/>
+ <subsection name="Message Driven Tests">
+ <p>
+ If you have one or more message driven beans, you must make sure the
+ <code>EJB3Container.java</code> contains the following section
+ in the <i>startup</i> method:
+<source><![CDATA[
+ logger.info("==>Deploying jboss-jms-beans - init JBoss MQ core services");
+ EJB3StandaloneBootstrap.deployXmlResource("jboss-jms-beans.xml");
+ logger.info("==>Deployed jboss-jms-beans");
+
+ logger.info("==>Configure test queue and topic");
+ EJB3StandaloneBootstrap.deployXmlResource("testjms.xml");
+ logger.info("==>Configured test queues and topics");
+]]></source>
+ </p>
+ <p>
+ The cartridge will generate one test class with one test case per message driven bean to
+ the <code>core/src/test/java</code> source folder in the corresponding package.
+ The the test source files will NOT be
+ over-written, so if you wish, you can add further cases.
+ </p>
+ <p>
+ Take a look at your <code>testng.xml</code> in <code>core/src/test/resources</code>.
+ Apart from the other session test classes, you also have a message driven test class
+ reference. This is how message driven tests are triggered.
+ </p>
+ <p>
+ Finally, take a look at <code>testjms.xml</code>. This file contains the necessary
+ configuration to create the queue/topics within the embedded container before the
+ MDB's are deployed and tests are run. This file will be automatically re-generated on
+ every run, so when you add another MDB, this file will be updated to reflect the
+ addition of another queue or topic.
+ </p>
+ <p class="highlight">
+ For your message driven test framework to work, you need to make sure the <code>jms-ra.rar</code>
+ and <code>jcainflow.rar</code> RAR files exist in your project <code>src/test/resources</code>
+ folder. These are from JBoss Embeddable Microcontainer <code>lib</code>. When you run
+ your model generation phase, these libs will be automatically copied to your resources
+ folder. We are forced to do this until Eclipse (perhaps other IDE's don't have this issue) can
+ include .rar files in the project classpath.
+ </p>
+ </subsection>
</section>
</body>
</document>
|
|
From: Vance K. <va...@us...> - 2007-02-12 02:07:45
|
User: vancek
Date: 07/02/11 18:07:46
Modified: andromda-ejb3/src/main/resources/META-INF/andromda
cartridge.xml
Added: andromda-ejb3/src/main/resources/lib/jboss/microcontainer
jcainflow.rar jms-ra.rar
Log:
provide jboss embeddable rar resources for embeddable container testing
Revision Changes Path
1.1 cartridges/andromda-ejb3/src/main/resources/lib/jboss/microcontainer/jcainflow.rar
<<Binary file>>
1.1 cartridges/andromda-ejb3/src/main/resources/lib/jboss/microcontainer/jms-ra.rar
<<Binary file>>
1.35 +8 -0 cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/cartridge.xml
Index: cartridge.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/cartridge.xml,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -w -r1.34 -r1.35
--- cartridge.xml 11 Feb 2007 14:06:34 -0000 1.34
+++ cartridge.xml 12 Feb 2007 02:07:46 -0000 1.35
@@ -66,6 +66,14 @@
<!-- cartridge-resource merge-point -->
+ <resource
+ path="lib/jboss/microcontainer/*.rar"
+ outputPattern="{0}"
+ outlet="test-config"
+ overwrite="true"
+ lastModifiedCheck="true"/>
+
+
<!-- Entity Bean Templates -->
<template
|
|
From: Vance K. <va...@us...> - 2007-02-12 02:07:33
|
User: vancek Date: 07/02/11 18:07:31 cartridges/andromda-ejb3/src/main/resources/lib - New directory |
|
From: Vance K. <va...@us...> - 2007-02-12 02:07:33
|
User: vancek Date: 07/02/11 18:07:31 cartridges/andromda-ejb3/src/main/resources/lib/jboss - New directory |
|
From: Vance K. <va...@us...> - 2007-02-12 02:07:33
|
User: vancek Date: 07/02/11 18:07:31 cartridges/andromda-ejb3/src/main/resources/lib/jboss/microcontainer - New directory |
|
From: Vance K. <va...@us...> - 2007-02-11 14:06:45
|
User: vancek
Date: 07/02/11 06:06:39
Modified: andromda-ejb3/src/main/resources/templates/ejb3/test
EJB3Container.vsl testng.xml.vsl
andromda-ejb3/src/main/resources/META-INF/andromda
namespace.xml metafacades.xml cartridge.xml
andromda-ejb3/src/test/expected cartridge-output.zip
andromda-ejb3/src/site changes.xml
andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3SessionFacadeLogicImpl.java
EJB3MessageDrivenFacadeLogicImpl.java
andromda-ejb3/src/main/uml EJB3MetafacadeModel.xml.zip
Added: andromda-ejb3/src/main/resources/templates/ejb3/test
testjms.xml.vsl MessageDrivenTest.vsl
Log:
add MDB test within embeddable container
Revision Changes Path
1.2 +33 -23 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/test/EJB3Container.vsl
Index: EJB3Container.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/test/EJB3Container.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- EJB3Container.vsl 4 Feb 2007 02:45:07 -0000 1.1
+++ EJB3Container.vsl 11 Feb 2007 14:06:32 -0000 1.2
@@ -47,33 +47,43 @@
// Boot the JBoss Microcontainer with EJB3 settings, loads ejb3-interceptors-aop.xml
EJB3StandaloneBootstrap.boot(null);
- logger.info("==>Deploying embedded-jboss-beans");
- // Deploy CaveatEmptor beans (datasource, mostly)
- //EJB3StandaloneBootstrap.deployXmlResource("embedded-jboss-beans.xml");
- //EJB3StandaloneBootstrap.deployXmlResource("ejb3-interceptors-aop.xml");
- //EJB3StandaloneBootstrap.deployXmlResource("jboss-jms-beans.xml");
- logger.info("==>Deployed embedded-jboss-beans");
-
#if ($stringUtils.isNotBlank(${securityRealm}))
logger.info("==>Deploying security-beans");
EJB3StandaloneBootstrap.deployXmlResource("security-beans.xml");
logger.info("==>Deployed security-beans");
+
#else
- /**
- * Uncomment the following to enable security
- *
- * logger.info("==>Deploying security-beans");
- * EJB3StandaloneBootstrap.deployXmlResource("security-beans.xml");
- * logger.info("==>Deployed security-beans");
- */
+// Uncomment the following to enable security
+// logger.info("==>Deploying security-beans");
+// EJB3StandaloneBootstrap.deployXmlResource("security-beans.xml");
+// logger.info("==>Deployed security-beans");
+
#end
+#if (!$mdbs.empty())
+ logger.info("==>Deploying jboss-jms-beans - init JBoss MQ core services");
+ EJB3StandaloneBootstrap.deployXmlResource("jboss-jms-beans.xml");
+ logger.info("==>Deployed jboss-jms-beans");
+
+ logger.info("==>Configure test queue and topic");
+ EJB3StandaloneBootstrap.deployXmlResource("testjms.xml");
+ logger.info("==>Configured test queues and topics");
+#else
+// logger.info("==>Deploying jboss-jms-beans - init JBoss MQ core services");
+// EJB3StandaloneBootstrap.deployXmlResource("jboss-jms-beans.xml");
+// logger.info("==>Deployed jboss-jms-beans");
+
+// logger.info("==>Configure test queue and topic");
+// EJB3StandaloneBootstrap.deployXmlResource("testjms.xml");
+// logger.info("==>Configured test queues and topics");
+
+#end
+ logger.info("==>Deploying ejb3");
EJB3StandaloneBootstrap.scanClasspath();
// Add all EJBs found in the archive that has this file
deployer = new EJB3StandaloneDeployer();
- logger.info("==>Deploying ejb3");
// Deploy everything we got
deployer.setKernel(EJB3StandaloneBootstrap.getKernel());
deployer.create();
1.3 +5 -2 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/test/testng.xml.vsl
Index: testng.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/test/testng.xml.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- testng.xml.vsl 9 Feb 2007 01:52:07 -0000 1.2
+++ testng.xml.vsl 11 Feb 2007 14:06:33 -0000 1.3
@@ -1,7 +1,7 @@
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="TimeTracker Test Suite" verbose="2" parallel="false">
- <test name="Services Test">
+<suite name="${entityManagerName} Test Suite" verbose="2" parallel="false">
+ <test name="${entityManagerName} Services Test">
<classes>
#if($stringUtils.isNotEmpty($ejb3TypesPackage))
#**##set ($testPackage = "${ejb3TypesPackage}.test.")
@@ -15,6 +15,9 @@
#foreach ($service in $services)
<class name="${service.fullyQualifiedServiceTestName}"/>
#end
+#foreach ($mdb in $mdbs)
+ <class name="${mdb.fullyQualifiedMessageDrivenTestName}"/>
+#end
</classes>
</test>
</suite>
1.1 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/test/testjms.xml.vsl
Index: testjms.xml.vsl
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
xmlns="urn:jboss:bean-deployer">
#foreach ($mdb in $mdbs)
#**##if ($mdb.destinationTypeQueue)
<bean name="jboss.mq.destination:service=Queue,name=${mdb.messageDrivenName}" class="org.jboss.mq.kernel.Queue">
<property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
<property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
<property name="destinationName">${mdb.messageDrivenName}</property>
<property name="JNDIName">${mdb.destination}</property>
</bean>
#**##elseif ($mdb.destinationTypeTopic)
<bean name="jboss.mq.destination:service=Topic,name=${mdb.messageDrivenName}" class="org.jboss.mq.kernel.Topic">
<property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
<property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
<property name="destinationName">${mdb.messageDrivenName}</property>
<property name="JNDIName">${mdb.destination}</property>
</bean>
#**##end
#end
</deployment>
1.1 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/test/MessageDrivenTest.vsl
Index: MessageDrivenTest.vsl
===================================================================
// license-header java merge-point
//
// Generated by: MessageDrivenTest.vsl in andromda-ejb3-cartridge.
//
#if ($stringUtils.isNotBlank($mdb.testPackageName))
package $mdb.testPackageName;
#end
#set ($generatedFile = "${stringUtils.replace($mdb.fullyQualifiedMessageDrivenTestName,'.','/')}.java")
#if($stringUtils.isNotEmpty($ejb3TypesPackage))
#**##set ($testPackage = "${ejb3TypesPackage}.test.")
#else
#**##set ($testPackage = "")
#end
import ${testPackage}EJB3Container;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
* Message Driven test class ${mdb.messageDrivenTestName} for testing with TestNG
* Check the testng.xml for initialisation of the EJB3Container before running any tests.
*/
public class $mdb.messageDrivenTestName
{
private static final Log logger = LogFactory.getLog(${mdb.messageDrivenTestName}.class);
@org.testng.annotations.Test
public void test${mdb.name}()
{
// try
// {
#if ($mdb.destinationTypeQueue)
// javax.jms.QueueConnection cnn = null;
// javax.jms.QueueSender sender = null;
// javax.jms.QueueSession session = null;
//
// javax.jms.Queue queue = (javax.jms.Queue)EJB3Container.getInitialContext().lookup("${mdb.destination}");
// javax.jms.QueueConnectionFactory factory = (javax.jms.QueueConnectionFactory)EJB3Container.getInitialContext().lookup("java:/ConnectionFactory");
// cnn = factory.createQueueConnection();
// session = cnn.createQueueSession(false, javax.jms.QueueSession.AUTO_ACKNOWLEDGE);
//
// javax.jms.TextMessage msg = session.createTextMessage("Test Message");
//
// sender = session.createSender(queue);
// sender.send(msg);
//
// Thread.sleep(1000);
// session.close();
// cnn.close();
#elseif ($mdb.destinationTypeTopic)
// javax.jms.TopicConnection cnn = null;
// javax.jms.TopicPublisher sender = null;
// javax.jms.TopicSession session = null;
//
// javax.jms.Topic topic = (javax.jms.Topic)EJB3Container.getInitialContext().lookup("${mdb.destination}");
// javax.jms.TopicConnectionFactory factory = (javax.jms.TopicConnectionFactory)EJB3Container.getInitialContext().lookup("java:/ConnectionFactory");
// cnn = factory.createTopicConnection();
// session = cnn.createTopicSession(false, javax.jms.TopicSession.AUTO_ACKNOWLEDGE);
//
// TextMessage msg = session.createTextMessage("Test Message");
//
// sender = session.createPublisher(topic);
// sender.send(msg);
//
// Thread.sleep(1000);
// session.close();
// cnn.close();
#end
// }
// catch (Exception ex)
// {
// logger.warn("Failed test ${mdb.messageDrivenTestName}", ex);
// }
}
}
1.35 +14 -0 cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/namespace.xml
Index: namespace.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/namespace.xml,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -w -r1.34 -r1.35
--- namespace.xml 4 Feb 2007 02:45:07 -0000 1.34
+++ namespace.xml 11 Feb 2007 14:06:34 -0000 1.35
@@ -533,6 +533,20 @@
bean implementation class name.
</documentation>
</property>
+ <property name="messageDrivenTestNamePattern">
+ <default>{0}Test</default>
+ <documentation>
+ The pattern to use when constructing the message driven bean
+ test class name.
+ </documentation>
+ </property>
+ <property name="messageDrivenTestPackageNamePattern">
+ <default>{0}.test</default>
+ <documentation>
+ The pattern to use when constructing the package for
+ the message driven bean test class.
+ </documentation>
+ </property>
<property name="interceptorNamePattern">
<default>{0}</default>
<documentation>
1.29 +2 -0 cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/metafacades.xml
Index: metafacades.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/metafacades.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -w -r1.28 -r1.29
--- metafacades.xml 4 Feb 2007 02:45:07 -0000 1.28
+++ metafacades.xml 11 Feb 2007 14:06:34 -0000 1.29
@@ -208,6 +208,8 @@
<property reference="messageDrivenImplementationNamePattern"/>
<property reference="messageDrivenListenerNamePattern"/>
<property reference="messageDrivenDestinationType"/>
+ <property reference="messageDrivenTestNamePattern"/>
+ <property reference="messageDrivenTestPackageNamePattern"/>
</metafacade>
<metafacade class="org.andromda.cartridges.ejb3.metafacades.EJB3MessageDrivenOperationFacadeLogicImpl">
<mapping>
1.34 +32 -0 cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/cartridge.xml
Index: cartridge.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/cartridge.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -w -r1.33 -r1.34
--- cartridge.xml 4 Feb 2007 02:45:07 -0000 1.33
+++ cartridge.xml 11 Feb 2007 14:06:34 -0000 1.34
@@ -710,6 +710,23 @@
<modelElement variable="services">
<type name="org.andromda.cartridges.ejb3.metafacades.EJB3SessionFacade"/>
</modelElement>
+ <modelElement variable="mdbs">
+ <type name="org.andromda.cartridges.ejb3.metafacades.EJB3MessageDrivenFacade"/>
+ </modelElement>
+ </modelElements>
+ </template>
+
+ <template
+ path="templates/ejb3/test/testjms.xml.vsl"
+ outputPattern="testjms.xml"
+ outlet="test-config"
+ overwrite="true"
+ outputToSingleFile="true"
+ outputOnEmptyElements="false">
+ <modelElements>
+ <modelElement variable="mdbs">
+ <type name="org.andromda.cartridges.ejb3.metafacades.EJB3MessageDrivenFacade"/>
+ </modelElement>
</modelElements>
</template>
@@ -724,6 +741,9 @@
<modelElement variable="services">
<type name="org.andromda.cartridges.ejb3.metafacades.EJB3SessionFacade"/>
</modelElement>
+ <modelElement variable="mdbs">
+ <type name="org.andromda.cartridges.ejb3.metafacades.EJB3MessageDrivenFacade"/>
+ </modelElement>
</modelElements>
</template>
@@ -739,6 +759,18 @@
</modelElements>
</template>
+ <template
+ path="templates/ejb3/test/MessageDrivenTest.vsl"
+ outputPattern="$generatedFile"
+ outlet="test-impls"
+ overwrite="false">
+ <modelElements variable="mdb">
+ <modelElement>
+ <type name="org.andromda.cartridges.ejb3.metafacades.EJB3MessageDrivenFacade"/>
+ </modelElement>
+ </modelElements>
+ </template>
+
<!-- Microcontainer templates -->
<template
1.3 +454 -451 cartridges/andromda-ejb3/src/test/expected/cartridge-output.zip
<<Binary file>>
1.8 +3 -0 cartridges/andromda-ejb3/src/site/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/changes.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- changes.xml 7 Feb 2007 04:28:44 -0000 1.7
+++ changes.xml 11 Feb 2007 14:06:37 -0000 1.8
@@ -370,6 +370,9 @@
<action dev="vancek" type="fix">
Finally added cartridge tests!
</action>
+ <action dev="vancek" type="add">
+ Add support for MDB testing within embedded EJB3 container. Further customised test templates.
+ </action>
</release>
</body>
</document>
\ No newline at end of file
1.21 +1 -0 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3SessionFacadeLogicImpl.java
Index: EJB3SessionFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3SessionFacadeLogicImpl.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -w -r1.20 -r1.21
--- EJB3SessionFacadeLogicImpl.java 4 Feb 2007 02:45:06 -0000 1.20
+++ EJB3SessionFacadeLogicImpl.java 11 Feb 2007 14:06:37 -0000 1.21
@@ -78,6 +78,7 @@
* The property which stores the pattern defining the service test package
*/
private static final String SERVICE_TEST_PACKAGE_NAME_PATTERN = "serviceTestPackageNamePattern";
+
/**
* The property which stores the pattern defining the default service bean
* exception class name.
1.12 +45 -1 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3MessageDrivenFacadeLogicImpl.java
Index: EJB3MessageDrivenFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3MessageDrivenFacadeLogicImpl.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- EJB3MessageDrivenFacadeLogicImpl.java 17 Jan 2007 00:50:55 -0000 1.11
+++ EJB3MessageDrivenFacadeLogicImpl.java 11 Feb 2007 14:06:37 -0000 1.12
@@ -48,6 +48,16 @@
*/
private static final String MESSAGE_DRIVEN_IMPLEMENTATION_NAME_PATTERN = "messageDrivenImplementationNamePattern";
+ /**
+ * The property which stores the pattern defining the JMS message driven bean test class name
+ */
+ private static final String MESSAGE_DRIVEN_TEST_NAME_PATTERN = "messageDrivenTestNamePattern";
+
+ /**
+ * The property which stores the pattern defining the JMS message driven bean test package
+ */
+ private static final String MESSAGE_DRIVEN_TEST_PACKAGE_NAME_PATTERN = "messageDrivenTestPackageNamePattern";
+
// ---------------- constructor -------------------------------
public EJB3MessageDrivenFacadeLogicImpl (Object metaObject, String context)
@@ -106,6 +116,17 @@
}
/**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3MessageDrivenFacadeLogic#handleGetTestPackageName()
+ */
+ protected String handleGetTestPackageName()
+ {
+ String namespacePattern = String.valueOf(this.getConfiguredProperty(MESSAGE_DRIVEN_TEST_PACKAGE_NAME_PATTERN));
+ return MessageFormat.format(
+ namespacePattern,
+ new Object[] {this.getPackageName()});
+ }
+
+ /**
* @see org.andromda.cartridges.ejb3.metafacades.EJB3MessageDrivenFacade#getFullyQualifiedMessageDrivenImplementationName()
*/
protected java.lang.String handleGetFullyQualifiedMessageDrivenImplementationName()
@@ -139,6 +160,17 @@
}
/**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3MessageDrivenFacadeLogic#handleGetFullyQualifiedMessageDrivenTestName()
+ */
+ protected String handleGetFullyQualifiedMessageDrivenTestName()
+ {
+ return EJB3MetafacadeUtils.getFullyQualifiedName(
+ this.getTestPackageName(),
+ this.getMessageDrivenTestName(),
+ null);
+ }
+
+ /**
* @see org.andromda.cartridges.ejb3.metafacades.EJB3MessageDrivenFacade#getMessageDrivenImplementationName()
*/
protected java.lang.String handleGetMessageDrivenImplementationName()
@@ -178,6 +210,19 @@
}
/**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3MessageDrivenFacadeLogic#handleGetMessageDrivenTestName()
+ */
+ protected String handleGetMessageDrivenTestName()
+ {
+ String messageDrivenTestNamePattern =
+ (String)this.getConfiguredProperty(MESSAGE_DRIVEN_TEST_NAME_PATTERN);
+
+ return MessageFormat.format(
+ messageDrivenTestNamePattern,
+ new Object[] {StringUtils.trimToEmpty(this.getName())});
+ }
+
+ /**
* @see org.andromda.cartridges.ejb3.metafacades.EJB3MessageDrivenFacade#getMessageSelector()
*/
protected java.lang.String handleGetMessageSelector()
@@ -437,5 +482,4 @@
}
return excludeDefault;
}
-
}
\ No newline at end of file
1.51 +225 -280 cartridges/andromda-ejb3/src/main/uml/EJB3MetafacadeModel.xml.zip
<<Binary file>>
|
|
From: Vance K. <va...@us...> - 2007-02-09 01:52:07
|
User: vancek
Date: 07/02/08 17:52:07
Modified: andromda-ejb3/src/main/resources/templates/ejb3/test
testng.xml.vsl
Log:
only add the EJB3Container class as a test if session beans exist
Revision Changes Path
1.2 +2 -0 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/test/testng.xml.vsl
Index: testng.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/test/testng.xml.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- testng.xml.vsl 4 Feb 2007 02:45:07 -0000 1.1
+++ testng.xml.vsl 9 Feb 2007 01:52:07 -0000 1.2
@@ -8,8 +8,10 @@
#else
#**##set ($testPackage = "")
#end
+#if (!$services.isEmpty())
<!-- Always start the EJB3 embeddable container before running the tests -->
<class name="${testPackage}EJB3Container"/>
+#end
#foreach ($service in $services)
<class name="${service.fullyQualifiedServiceTestName}"/>
#end
|
|
From: Vance K. <va...@us...> - 2007-02-07 04:28:45
|
User: vancek
Date: 07/02/06 20:28:44
Modified: andromda-ejb3/conf/test andromda.xml
andromda-ejb3/src/test/uml EJB3CartridgeTestModel.xml.zip
andromda-ejb3/src/test/expected cartridge-output.zip
andromda-ejb3 pom.xml
andromda-ejb3/src/site changes.xml
. pom.xml
Log:
fix and start cartridge tests
Revision Changes Path
1.2 +73 -4 cartridges/andromda-ejb3/conf/test/andromda.xml
Index: andromda.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/conf/test/andromda.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- andromda.xml 28 Dec 2005 00:32:54 -0000 1.1
+++ andromda.xml 7 Feb 2007 04:28:44 -0000 1.2
@@ -18,19 +18,88 @@
</repository>
</repositories>
<namespaces>
- <namespace name="ejb3">
+ <namespace name="default">
<properties>
<property name="overwrite">true</property>
<property name="languageMappingsUri">Java</property>
<property name="wrapperMappingsUri">JavaWrapper</property>
<property name="jdbcMappingsUri">JDBC</property>
- <property name="sqlMappingsUri">Oracle9i</property>
+ <property name="sqlMappingsUri">HypersonicSql</property>
+ <property name="maxSqlNameLength">30</property>
+ <property name="foreignKeySuffix">_FK</property>
+ <property name="ejbJndiNamePrefix">ejb3test-1.0-SNAPSHOT</property>
+ <!-- these masking properties allow you to configure the way
+ your model element names are generated -->
+ <property name="classifierNameMask">none</property>
+ <property name="operationNameMask">none</property>
+ <property name="roleNameMask">none</property>
+ <property name="enumerationNameMask">none</property>
+ <property name="enumerationLiteralNameMask">upperunderscore</property>
+ <property name="entityNameMask">none</property>
+ <property name="entityPropertyNameMask">none</property>
+ <property name="parameterNameMask">none</property>
+ </properties>
+ </namespace>
+ <namespace name="ejb3">
+ <properties>
+ <property name="overwrite">true</property>
+ <property name="mergeMappingsUri">file:${test.src.dir}/mappings/MergeMappings.xml</property>
+ <property name="value-objects">${test.output.dir}</property>
<property name="entity-beans">${test.output.dir}</property>
<property name="entity-impls">${test.output.dir}</property>
+ <property name="entity-config">${test.output.dir}</property>
<property name="session-beans">${test.output.dir}</property>
<property name="session-impls">${test.output.dir}</property>
- <property name="value-objects">${test.output.dir}</property>
- <property name="mergeMappingsUri">file:${pom.basedir}/src/test/mappings/MergeMappings.xml</property>
+ <property name="session-config">${test.output.dir}</property>
+ <property name="message-driven-beans">${test.output.dir}</property>
+ <property name="message-driven-impls">${test.output.dir}</property>
+ <property name="daos">${test.output.dir}</property>
+ <property name="dao-impls">${test.output.dir}</property>
+ <property name="commons">${test.output.dir}</property>
+ <property name="user-types">${test.output.dir}</property>
+ <property name="services">${test.output.dir}</property>
+ <property name="application-config">${test.output.dir}</property>
+ <property name="application-metainf">${test.output.dir}</property>
+ <property name="test-config">${test.output.dir}</property>
+ <property name="tests">${test.output.dir}</property>
+ <property name="test-impls">${test.output.dir}</property>
+ <property name="ejb3TypesPackage">org.andromda.ejb3test</property>
+ <property name="persistenceContainerName">jboss</property>
+ <property name="persistenceContextUnitName">ejb3test</property>
+ <property name="entityManagerName">ejb3test</property>
+ <property name="entityManagerJTADataSource">java:/DefaultDS</property>
+ <property name="hibernateDialect">net.sf.hibernate.dialect.HSQLDialect</property>
+ <property name="hibernateHbm2DDLAuto">update</property>
+ <property name="enableTemplating">true</property>
+ <!-- uncomment to specify transaction manager
+ <property name="hibernateTransactionManagerLookupClass">org.hibernate.transaction.JBossTransactionManagerLookup</property>
+ -->
+ <property name="securityRealm">ejb3test</property>
+ <property name="jndiNamePrefix">ejb3test-1.0-SNAPSHOT</property>
+ <property name="hibernateEnableCache">false</property>
+ <property name="hibernateEnableAssociationsCache">false</property>
+ <property name="hibernateUseQueryCache">false</property>
+ <property name="useDefaultCacheRegion">false</property>
+ <property name="hibernateCacheProvider">org.jboss.ejb3.entity.TreeCacheProviderHook</property>
+ <property name="hibernateTreecacheMbeanObject">jboss.cache:service=EJB3EntityTreeCache</property>
+ <!-- uncomment to enable default entity cache settings
+ <property name="hibernateEntityCache">TRANSACTIONAL</property>
+ -->
+ <!-- uncomment to enable default association caching configuration
+ <property name="hibernateAssociationCache">TRANSACTIONAL</property>
+ -->
+ <property name="enableClustering">false</property>
+ <property name="webServiceEnabled">false</property>
+ <property name="webServiceContextRoot">/ejb3test-ws</property>
+ <property name="webServiceUrlPattern">/services</property>
+ <property name="persistenceProviderExtensions">hibernate</property>
+ </properties>
+ </namespace>
+ <namespace name="java">
+ <properties>
+ <property name="exceptions">${howto.output.dir}</property>
+ <property name="value-objects">${howto.output.dir}</property>
+ <property name="interfaces">${howto.output.dir}</property>
</properties>
</namespace>
</namespaces>
1.3 +265 -221 cartridges/andromda-ejb3/src/test/uml/EJB3CartridgeTestModel.xml.zip
<<Binary file>>
1.2 +2017 -97 cartridges/andromda-ejb3/src/test/expected/cartridge-output.zip
<<Binary file>>
1.15 +0 -1 cartridges/andromda-ejb3/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/pom.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -r1.14 -r1.15
--- pom.xml 19 Jan 2007 14:35:51 -0000 1.14
+++ pom.xml 7 Feb 2007 04:28:44 -0000 1.15
@@ -282,7 +282,6 @@
</plugins>
</reporting>
<properties>
- <maven.test.skip>true</maven.test.skip>
<model.uri>jar:file:${pom.basedir}/src/main/uml/EJB3MetafacadeModel.xml.zip!/EJB3MetafacadeModel.xml</model.uri>
<test.model.uri>jar:file:${pom.basedir}/src/test/uml/EJB3CartridgeTestModel.xml.zip!/EJB3CartridgeTestModel.xml</test.model.uri>
</properties>
1.7 +3 -0 cartridges/andromda-ejb3/src/site/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/changes.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- changes.xml 4 Feb 2007 02:45:08 -0000 1.6
+++ changes.xml 7 Feb 2007 04:28:44 -0000 1.7
@@ -367,6 +367,9 @@
the container before and after all tests, a testng.xml config file and basic test class per session bean
modelled. The embeddable container version is ALPHA_9.
</action>
+ <action dev="vancek" type="fix">
+ Finally added cartridge tests!
+ </action>
</release>
</body>
</document>
\ No newline at end of file
1.11 +1 -0 cartridges/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/pom.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- pom.xml 19 Jan 2007 14:35:53 -0000 1.10
+++ pom.xml 7 Feb 2007 04:28:44 -0000 1.11
@@ -87,6 +87,7 @@
<properties>
<build.src>${pom.basedir}/target/src</build.src>
<java.src.dir>${pom.basedir}/src/main/java</java.src.dir>
+ <test.src.dir>${pom.basedir}/src/test</test.src.dir>
<test.output.dir>${pom.basedir}/target/cartridge-test/actual</test.output.dir>
<src.dir>${pom.basedir}/src</src.dir>
<howto.output.dir>${pom.basedir}/target/site/howto</howto.output.dir>
|
|
From: Vance K. <va...@us...> - 2007-02-06 02:54:50
|
User: vancek
Date: 07/02/05 18:54:51
Modified: samples/timetracker-ejb3/core/src/test/resources log4j.xml
testng.xml
samples/timetracker-ejb3/mda/src/main/uml timetracker.xmi
samples/timetracker-ejb3 pom.xml sql.txt
samples/timetracker-ejb3/core/src/main/java/org/andromda/timetracker/service
UserServiceBean.java
samples/timetracker-ejb3/app pom.xml
samples/timetracker-ejb3/mda pom.xml
samples/timetracker-ejb3/app/src/main/application/META-INF
timetracker-login-config.xml
samples/timetracker-ejb3/client/src/main/java/org/andromda/timetracker/client
Client.java
samples/timetracker-ejb3/mda/src/main/config andromda.xml
samples/timetracker-ejb3/core pom.xml
samples/timetracker-ejb3/client pom.xml
Added: samples/timetracker-ejb3/core/src/test/resources
roles.properties users.properties login-config.xml
embedded-jboss-beans.xml ejb3-interceptors-aop.xml
jboss-jms-beans.xml jndi.properties
default.persistence.properties security-beans.xml
samples/timetracker-ejb3/core/src/test/java/org/andromda/timetracker/service/test
UserServiceTest.java
samples/timetracker-ejb3/common/src/main/java/org/andromda/timetracker/security
PasswordEncoder.java
Removed: samples/timetracker-ejb3/core/src/test/java/org/andromda/timetracker/service
TimeTrackingServiceTest.java UserServiceTest.java
Log:
update timetracker ejb3 project to include testng tests run in embeddable microcontainer
Revision Changes Path
1.2 +32 -110 plugins/samples/timetracker-ejb3/core/src/test/resources/log4j.xml
Index: log4j.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/samples/timetracker-ejb3/core/src/test/resources/log4j.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- log4j.xml 24 Jan 2007 04:33:36 -0000 1.1
+++ log4j.xml 6 Feb 2007 02:54:49 -0000 1.2
@@ -1,115 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<!--
-******************************************************************************
-* Log4j Configuration
-*
-* Logging levels (higest to lowest):
-* off, fatal, error, warn, info, debug, all
-* A logging request is enabled if its level is
-* higher than or equal to the level of its logger.
-******************************************************************************
--->
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+<!-- $Id: log4j.xml,v 1.2 2007/02/06 02:54:49 vancek Exp $ -->
- <!-- ******************************************************************* -->
- <!-- ConsoleAppender -->
- <!-- ******************************************************************* -->
- <appender name="ConsoleAppender" class="org.apache.log4j.ConsoleAppender">
- <param name="Threshold" value="warn"/>
+<!--
+ | For more configuration infromation and examples see the Jakarta Log4j
+ | owebsite: http://jakarta.apache.org/log4j
+ -->
- <layout class="org.apache.log4j.PatternLayout">
- <!-- Conversion pattern: Message\n -->
- <param name="ConversionPattern" value="%m%n"/>
- </layout>
- </appender>
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
- <!-- ******************************************************************* -->
- <!-- FileAppender -->
- <!-- ******************************************************************* -->
- <appender name="FileAppender" class="org.apache.log4j.RollingFileAppender">
- <param name="File" value="timetracker-test.log"/>
- <param name="Append" value="false"/>
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Target" value="System.out"/>
+ <param name="Threshold" value="INFO"/>
<layout class="org.apache.log4j.PatternLayout">
- <!-- Conversion pattern: Time Priority - Message\n -->
- <param name="ConversionPattern" value="%d{HH:mm:ss.SSS} %-5p - %m%n"/>
-
- <!-- Alternate Conversion pattern: Time Priority - Class[Line] - Message\n -->
+ <!-- The default pattern: Date Priority [Category] Messagen -->
<!--
- <param name="ConversionPattern" value="%d{HH:mm:ss.SSS} %-5p %50C[%4L] - %m%n"/>
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-->
+ <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L) -%m%n"/>
</layout>
</appender>
- <!-- ******************************************************************* -->
- <!-- Low Level Loggers -->
- <!-- ******************************************************************* -->
- <!-- Log hibernate messages -->
- <logger name="org.hibernate">
- <level value="warn"/>
- </logger>
-
- <!-- Log HQL query parser activity -->
- <logger name="org.hibernate.hql.ast.AST">
- <level value="warn"/>
- </logger>
-
- <!-- Log just the SQL -->
- <logger name="org.hibernate.SQL">
- <level value="debug"/>
- </logger>
-
- <!-- Log JDBC bind parameters -->
- <logger name="org.hibernate.type">
- <level value="debug"/>
- </logger>
-
- <!-- Log schema export/update -->
- <logger name="org.hibernate.tool.hbm2ddl">
- <level value="warn"/>
- </logger>
-
- <!-- Log HQL parse trees -->
- <logger name="org.hibernate.hql">
- <level value="warn"/>
- </logger>
-
- <!-- Log cache activity -->
- <logger name="org.hibernate.cache">
- <level value="warn"/>
- </logger>
-
- <!-- Log transaction activity -->
- <logger name="org.hibernate.transaction">
- <level value="warn"/>
- </logger>
-
- <!-- Log JDBC resource acquisition -->
- <logger name="org.hibernate.jdbc">
- <level value="warn"/>
- </logger>
-
- <!-- Track down connection leakages when using DriverManagerConnectionProvider -->
- <logger name="org.hibernate.connection.DriverManagerConnectionProvider">
- <level value="warn"/>
- </logger>
-
- <!-- Log TimeTracker messages -->
- <logger name="org.andromda.timetracker">
- <level value="debug"/>
- </logger>
-
- <!-- ******************************************************************* -->
- <!-- Root Logger -->
- <!-- ******************************************************************* -->
- <!-- Allow warning and higher messages from everyone to go to console and file -->
<root>
- <level value="warn"/>
- <appender-ref ref="ConsoleAppender"/>
- <appender-ref ref="FileAppender"/>
+ <appender-ref ref="CONSOLE"/>
</root>
</log4j:configuration>
\ No newline at end of file
1.2 +9 -9 plugins/samples/timetracker-ejb3/core/src/test/resources/testng.xml
Index: testng.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/samples/timetracker-ejb3/core/src/test/resources/testng.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- testng.xml 24 Jan 2007 04:33:36 -0000 1.1
+++ testng.xml 6 Feb 2007 02:54:49 -0000 1.2
@@ -1,12 +1,12 @@
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="TimeTracker Test Suite" verbose="1">
+<suite name="TimeTracker Test Suite" verbose="2" parallel="false">
<test name="Services Test">
<classes>
- <!--
- <class name="org.andromda.timetracker.service.UserServiceTest" />
- <class name="org.andromda.timetracker.service.TimeTrackingServiceTest" />
- -->
+ <!-- Always start the EJB3 embeddable container before running the tests -->
+ <class name="org.andromda.timetracker.test.EJB3Container"/>
+ <class name="org.andromda.timetracker.service.test.UserServiceTest"/>
+ <class name="org.andromda.timetracker.service.test.TimeTrackingServiceTest"/>
</classes>
</test>
</suite>
1.1 plugins/samples/timetracker-ejb3/core/src/test/resources/roles.properties
Index: roles.properties
===================================================================
admin=USER,ADMIN
user=USER
1.1 plugins/samples/timetracker-ejb3/core/src/test/resources/users.properties
Index: users.properties
===================================================================
admin=admin
user=password
1.1 plugins/samples/timetracker-ejb3/core/src/test/resources/login-config.xml
Index: login-config.xml
===================================================================
<?xml version='1.0'?>
<!DOCTYPE policy PUBLIC
"-//JBoss//DTD JBOSS Security Config 3.0//EN"
"http://www.jboss.org/j2ee/dtd/security_config.dtd">
<!-- The XML based JAAS login configuration read by the
org.jboss.security.auth.login.XMLLoginConfig mbean. Add
an application-policy element for each security domain.
The outline of the application-policy is:
<application-policy name="security-domain-name">
<authentication>
<login-module code="login.module1.class.name" flag="control_flag">
<module-option name = "option1-name">option1-value</module-option>
<module-option name = "option2-name">option2-value</module-option>
...
</login-module>
<login-module code="login.module2.class.name" flag="control_flag">
...
</login-module>
...
</authentication>
</application-policy>
$Revision: 1.1 $
-->
<policy>
<!-- Used by clients within the application server VM such as
mbeans and servlets that access EJBs.
-->
<application-policy name="client-login">
<authentication>
<login-module code="org.jboss.security.ClientLoginModule"
flag="required">
<!-- Any existing security context will be restored on logout -->
<module-option name="restore-login-identity">true</module-option>
</login-module>
</authentication>
</application-policy>
<application-policy name="other">
<!-- A simple server login module, which can be used when the number
of users is relatively small. It uses two properties files:
users.properties, which holds users (key) and their password (value).
roles.properties, which holds users (key) and a comma-separated list of
their roles (value).
The unauthenticatedIdentity property defines the name of the principal
that will be used when a null username and password are presented as is
the case for an unuathenticated web client or MDB. If you want to
allow such users to be authenticated add the property, e.g.,
unauthenticatedIdentity="nobody"
-->
<authentication>
<login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
flag="required"/>
</authentication>
</application-policy>
<application-policy name="timetracker">
<!-- A simple server login module, which can be used when the number
of users is relatively small. It uses two properties files:
users.properties, which holds users (key) and their password (value).
roles.properties, which holds users (key) and a comma-separated list of
their roles (value).
The unauthenticatedIdentity property defines the name of the principal
that will be used when a null username and password are presented as is
the case for an unuathenticated web client or MDB. If you want to
allow such users to be authenticated add the property, e.g.,
unauthenticatedIdentity="nobody"
-->
<authentication>
<login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
flag="required"/>
</authentication>
</application-policy>
</policy>
1.1 plugins/samples/timetracker-ejb3/core/src/test/resources/embedded-jboss-beans.xml
Index: embedded-jboss-beans.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
xmlns="urn:jboss:bean-deployer:2.0">
<bean name="Naming" class="org.jnp.server.SingletonNamingServer"/>
<bean name="InitialContextProperties" class="java.util.Hashtable">
<constructor>
<parameter class="java.util.Map">
<map keyClass="java.lang.String" valueClass="java.lang.String">
<entry>
<key>java.naming.factory.initial</key>
<value>org.jnp.interfaces.LocalOnlyContextFactory</value>
</entry>
<entry>
<key>java.naming.factory.url.pkgs</key>
<value>org.jboss.naming:org.jnp.interfaces</value>
</entry>
</map>
</parameter>
</constructor>
</bean>
<bean name="java:comp/Initializer" class="org.jboss.ejb3.embedded.JavaCompInitializer">
<property name="jndiProperties"><inject bean="InitialContextProperties"/></property>
</bean>
<bean name="XidFactory" class="org.jboss.tm.XidFactoryImpl"/>
<bean name="XidFactoryMBean" class="org.jboss.ejb3.embedded.XidFactoryMBean">
<constructor>
<parameter class="org.jboss.tm.XidFactoryBase">
<inject bean="XidFactory"/>
</parameter>
</constructor>
</bean>
<bean name="TransactionManagerInitializer" class="org.jboss.tm.TransactionManagerInitializer">
<property name="xidFactory"><inject bean="XidFactory"/></property>
<property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
</bean>
<bean name="UserTransaction" class="org.jboss.ejb3.embedded.UserTransactionImpl">
<demand>TransactionManagerInitializer</demand>
</bean>
<bean name="UserTransactionBinding" class="org.jboss.ejb3.embedded.JndiBinder">
<property name="jndiProperties"><inject bean="InitialContextProperties"/></property>
<property name="target"><inject bean="UserTransaction"/></property>
<property name="bindTo">UserTransaction</property>
<property name="serializable">false</property>
</bean>
<bean name="TransactionManager" class="java.lang.Object">
<constructor factoryMethod="getTransactionManager">
<factory bean="TransactionManagerInitializer"/>
</constructor>
</bean>
<bean name="CachedConnectionManager" class="org.jboss.resource.connectionmanager.CachedConnectionManagerReference">
<property name="transactionManager"><inject bean="TransactionManager"/></property>
</bean>
<!--
<bean class="org.jboss.jdbc.HypersonicDatabase"
name="jboss:service=Hypersonic,database=localDB">
<property name="database">localDB</property>
<property name="inProcessMode">true</property>
<property name="dbDataDir">.</property>
</bean>
-->
<bean name="DefaultDSBootstrap" class="org.jboss.resource.adapter.jdbc.local.LocalTxDataSource">
<property name="driverClass">org.hsqldb.jdbcDriver</property>
<property name="connectionURL">jdbc:hsqldb:.</property>
<!-- <property name="connectionURL">jdbc:hsqldb:./hypersonic/localDB</property> -->
<property name="userName">sa</property>
<property name="jndiName">java:/DefaultDS</property>
<property name="minSize">0</property>
<property name="maxSize">10</property>
<property name="blockingTimeout">1000</property>
<property name="idleTimeout">100000</property>
<property name="transactionManager"><inject bean="TransactionManager"/></property>
<property name="cachedConnectionManager"><inject bean="CachedConnectionManager"/></property>
<property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
</bean>
<bean name="DefaultDS" class="java.lang.Object">
<constructor factoryMethod="getDatasource">
<factory bean="DefaultDSBootstrap"/>
</constructor>
</bean>
<bean name="timetrackerDatasourceBootstrap" class="org.jboss.resource.adapter.jdbc.local.LocalTxDataSource">
<property name="driverClass">com.mysql.jdbc.Driver</property>
<property name="connectionURL">jdbc:mysql://localhost:3306/timetracker</property>
<!-- <property name="connectionURL">jdbc:hsqldb:./hypersonic/localDB</property> -->
<!-- <property name="userName">sa</property> -->
<property name="jndiName">java:/jdbc/timetracker</property>
<property name="minSize">0</property>
<property name="maxSize">10</property>
<property name="blockingTimeout">1000</property>
<property name="idleTimeout">100000</property>
<property name="transactionManager"><inject bean="TransactionManager"/></property>
<property name="cachedConnectionManager"><inject bean="CachedConnectionManager"/></property>
<property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
</bean>
<bean name="jdbc/timetracker" class="java.lang.Object">
<constructor factoryMethod="getDatasource">
<factory bean="timetrackerDatasourceBootstrap"/>
</constructor>
</bean>
<!--
<bean name="TimerServiceFactory" class="org.jboss.ejb3.timerservice.quartz.QuartzTimerServiceFactory">
<property name="properties">
org.quartz.jobStore.class=org.quartz.impl.jdbcjobstore.JobStoreCMT
org.quartz.jobStore.nonManagedTXDataSource=myDS
org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.HSQLDBDelegate
org.quartz.jobStore.tablePrefix=QRTZ_
org.quartz.jobStore.dataSource=myDS
# To get it to work with hypersonic
# FIXME: this doesn't lock the row
org.quartz.jobStore.selectWithLockSQL=SELECT * FROM qrtz_locks WHERE lock_name = ?
# from quartz.properties
org.quartz.scheduler.instanceName=JBossEJB3QuartzScheduler
org.quartz.scheduler.rmi.export=false
org.quartz.scheduler.rmi.proxy=false
org.quartz.scheduler.wrapJobExecutionInUserTransaction=false
org.quartz.threadPool.class=org.quartz.simpl.SimpleThreadPool
org.quartz.threadPool.threadCount=10
org.quartz.threadPool.threadPriority=5
org.quartz.threadPool.threadsInheritContextClassLoaderOfInitializingThread=true
org.quartz.jobStore.misfireThreshold=60000
</property>
<property name="dataSource">java:/DefaultDS</property>
<property name="sqlProperties">
CREATE_DB_ON_STARTUP = TRUE
CREATE_TABLE_JOB_DETAILS = CREATE TABLE qrtz_job_details(JOB_NAME VARCHAR(80) NOT NULL, JOB_GROUP VARCHAR(80) NOT NULL, \
DESCRIPTION VARCHAR(120) NULL, JOB_CLASS_NAME VARCHAR(128) NOT NULL, IS_DURABLE VARCHAR(1) NOT NULL, \
IS_VOLATILE VARCHAR(1) NOT NULL, IS_STATEFUL VARCHAR(1) NOT NULL, REQUESTS_RECOVERY VARCHAR(1) NOT NULL, \
JOB_DATA BINARY NULL, PRIMARY KEY (JOB_NAME,JOB_GROUP))
CREATE_TABLE_JOB_LISTENERS = CREATE TABLE qrtz_job_listeners(JOB_NAME VARCHAR(80) NOT NULL, JOB_GROUP VARCHAR(80) NOT NULL, \
JOB_LISTENER VARCHAR(80) NOT NULL, PRIMARY KEY (JOB_NAME,JOB_GROUP,JOB_LISTENER), FOREIGN KEY (JOB_NAME,JOB_GROUP) \
REFERENCES QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP))
CREATE_TABLE_TRIGGERS = CREATE TABLE qrtz_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, TRIGGER_GROUP VARCHAR(80) NOT NULL, \
JOB_NAME VARCHAR(80) NOT NULL, JOB_GROUP VARCHAR(80) NOT NULL, IS_VOLATILE VARCHAR(1) NOT NULL, DESCRIPTION VARCHAR(120) NULL, \
NEXT_FIRE_TIME NUMERIC(13) NULL, PREV_FIRE_TIME NUMERIC(13) NULL, TRIGGER_STATE VARCHAR(16) NOT NULL, \
TRIGGER_TYPE VARCHAR(8) NOT NULL, START_TIME NUMERIC(13) NOT NULL, END_TIME NUMERIC(13) NULL, CALENDAR_NAME VARCHAR(80) NULL, \
MISFIRE_INSTR NUMERIC(2) NULL, JOB_DATA BINARY NULL, PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (JOB_NAME,JOB_GROUP) \
REFERENCES QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP))
CREATE_TABLE_SIMPLE_TRIGGERS = CREATE TABLE qrtz_simple_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, \
TRIGGER_GROUP VARCHAR(80) NOT NULL, REPEAT_COUNT NUMERIC(7) NOT NULL, REPEAT_INTERVAL NUMERIC(12) NOT NULL, \
TIMES_TRIGGERED NUMERIC(7) NOT NULL, PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) \
REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
CREATE_TABLE_CRON_TRIGGERS = CREATE TABLE qrtz_cron_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, \
TRIGGER_GROUP VARCHAR(80) NOT NULL, CRON_EXPRESSION VARCHAR(80) NOT NULL, TIME_ZONE_ID VARCHAR(80), \
PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) \
REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
CREATE_TABLE_BLOB_TRIGGERS = CREATE TABLE qrtz_blob_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, \
TRIGGER_GROUP VARCHAR(80) NOT NULL, BLOB_DATA BINARY NULL, PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), \
FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
CREATE_TABLE_TRIGGER_LISTENERS = CREATE TABLE qrtz_trigger_listeners(TRIGGER_NAME VARCHAR(80) NOT NULL, \
TRIGGER_GROUP VARCHAR(80) NOT NULL, TRIGGER_LISTENER VARCHAR(80) NOT NULL, \
PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP,TRIGGER_LISTENER), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) \
REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
CREATE_TABLE_CALENDARS = CREATE TABLE qrtz_calendars(CALENDAR_NAME VARCHAR(80) NOT NULL, CALENDAR BINARY NOT NULL, \
PRIMARY KEY (CALENDAR_NAME))
CREATE_TABLE_PAUSED_TRIGGER_GRPS = CREATE TABLE qrtz_paused_trigger_grps(TRIGGER_GROUP VARCHAR(80) NOT NULL, \
PRIMARY KEY (TRIGGER_GROUP))
CREATE_TABLE_FIRED_TRIGGERS = CREATE TABLE qrtz_fired_triggers(ENTRY_ID VARCHAR(95) NOT NULL, TRIGGER_NAME VARCHAR(80) NOT NULL, \
TRIGGER_GROUP VARCHAR(80) NOT NULL, IS_VOLATILE VARCHAR(1) NOT NULL, INSTANCE_NAME VARCHAR(80) NOT NULL, \
FIRED_TIME NUMERIC(13) NOT NULL, STATE VARCHAR(16) NOT NULL, JOB_NAME VARCHAR(80) NULL, JOB_GROUP VARCHAR(80) NULL, \
IS_STATEFUL VARCHAR(1) NULL, REQUESTS_RECOVERY VARCHAR(1) NULL, PRIMARY KEY (ENTRY_ID))
CREATE_TABLE_SCHEDULER_STATE = CREATE TABLE qrtz_scheduler_state(INSTANCE_NAME VARCHAR(80) NOT NULL, \
LAST_CHECKIN_TIME NUMERIC(13) NOT NULL, CHECKIN_INTERVAL NUMERIC(13) NOT NULL, RECOVERER VARCHAR(80) NULL, \
PRIMARY KEY (INSTANCE_NAME))
CREATE_TABLE_LOCKS = CREATE TABLE qrtz_locks(LOCK_NAME VARCHAR(40) NOT NULL, PRIMARY KEY (LOCK_NAME))
INSERT_TRIGGER_ACCESS = INSERT INTO qrtz_locks values('TRIGGER_ACCESS')
INSERT_JOB_ACCESS = INSERT INTO qrtz_locks values('JOB_ACCESS')
INSERT_CALENDAR_ACCESS = INSERT INTO qrtz_locks values('CALENDAR_ACCESS')
INSERT_STATE_ACCESS = INSERT INTO qrtz_locks values('STATE_ACCESS')
INSERT_MISFIRE_ACCESS = INSERT INTO qrtz_locks values('MISFIRE_ACCESS')
</property>
</bean>
-->
</deployment>
1.1 plugins/samples/timetracker-ejb3/core/src/test/resources/ejb3-interceptors-aop.xml
Index: ejb3-interceptors-aop.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE aop PUBLIC
"-//JBoss//DTD JBOSS AOP 1.0//EN"
"http://www.jboss.org/aop/dtd/jboss-aop_1_0.dtd">
<aop>
<interceptor class="org.jboss.aspects.remoting.InvokeRemoteInterceptor" scope="PER_VM"/>
<interceptor class="org.jboss.aspects.security.SecurityClientInterceptor" scope="PER_VM"/>
<interceptor class="org.jboss.aspects.tx.ClientTxPropagationInterceptor" scope="PER_VM"/>
<interceptor class="org.jboss.ejb3.remoting.IsLocalInterceptor" scope="PER_VM"/>
<interceptor class="org.jboss.aspects.remoting.ClusterChooserInterceptor" scope="PER_VM"/>
<interceptor class="org.jboss.aspects.tx.TxPropagationInterceptor" scope="PER_VM"/>
<stack name="ServiceClientInterceptors">
<interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
<interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
<interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
<interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
</stack>
<stack name="AsynchronousStatelessSessionClientInterceptors">
<interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
<interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
<interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
<interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
</stack>
<stack name="AsynchronousStatefulSessionClientInterceptors">
<interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
<interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
<interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
<interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
</stack>
<stack name="StatelessSessionClientInterceptors">
<interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
<interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
<interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
<interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
</stack>
<stack name="StatefulSessionClientInterceptors">
<interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
<interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
<interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
<interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
</stack>
<stack name="ClusteredStatelessSessionClientInterceptors">
<interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
<interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
<interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
<interceptor-ref name="org.jboss.aspects.remoting.ClusterChooserInterceptor"/>
<interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
</stack>
<stack name="ClusteredStatefulSessionClientInterceptors">
<interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
<interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
<interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
<interceptor-ref name="org.jboss.aspects.remoting.ClusterChooserInterceptor"/>
<interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
</stack>
<interceptor class="org.jboss.ejb3.asynchronous.AsynchronousInterceptor" scope="PER_CLASS"/>
<interceptor class="org.jboss.ejb3.ENCPropagationInterceptor" scope="PER_VM"/>
<interceptor name="Basic Authorization" factory="org.jboss.ejb3.security.RoleBasedAuthorizationInterceptorFactory" scope="PER_CLASS"/>
<interceptor name="JACC Authorization" factory="org.jboss.ejb3.security.JaccAuthorizationInterceptorFactory" scope="PER_CLASS"/>
<interceptor factory="org.jboss.ejb3.security.AuthenticationInterceptorFactory" scope="PER_CLASS"/>
<interceptor factory="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory" scope="PER_CLASS"/>
<interceptor class="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor" scope="PER_VM"/>
<interceptor class="org.jboss.ejb3.stateless.StatelessInstanceInterceptor" scope="PER_VM"/>
<interceptor class="org.jboss.ejb3.stateful.StatefulInstanceInterceptor" scope="PER_VM"/>
<interceptor class="org.jboss.ejb3.stateful.SessionSynchronizationInterceptor" scope="PER_VM"/>
<interceptor class="org.jboss.ejb3.service.ServiceSingletonInterceptor" scope="PER_VM"/>
<interceptor class="org.jboss.ejb3.cache.StatefulReplicationInterceptor" scope="PER_VM"/>
<interceptor factory="org.jboss.ejb3.stateful.StatefulRemoveFactory" scope="PER_CLASS_JOINPOINT"/>
<interceptor factory="org.jboss.ejb3.tx.TxInterceptorFactory" scope="PER_CLASS_JOINPOINT"/>
<interceptor factory="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory" scope="PER_CLASS_JOINPOINT"/>
<interceptor factory="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory" scope="PER_CLASS"/>
<interceptor class="org.jboss.ejb3.AllowedOperationsInterceptor" scope="PER_VM"/>
<interceptor factory="org.jboss.ejb3.mdb.CurrentMessageInjectorInterceptorFactory" scope="PER_CLASS"/>
<interceptor class="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor" scope="PER_VM"/>
<domain name="Stateless Bean">
<bind pointcut="execution(public * *->*(..))">
<interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
<interceptor-ref name="Basic Authorization"/>
</bind>
<bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
<interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
<interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * *->*(..))">
<interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
<interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
<interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
</bind>
<annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
@org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
</annotation>
</domain>
<domain name="JACC Stateless Bean">
<bind pointcut="execution(public * *->*(..))">
<interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
<interceptor-ref name="JACC Authorization"/>
</bind>
<bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
<interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
<interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * *->*(..))">
<interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
<interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
<interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
</bind>
<annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
@org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
</annotation>
</domain>
<domain name="Base Stateful Bean">
<bind pointcut="execution(public * *->*(..))">
<interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
<interceptor-ref name="Basic Authorization"/>
</bind>
<bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
<interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
<interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * *->@javax.ejb.Remove(..))">
<interceptor-ref name="org.jboss.ejb3.stateful.StatefulRemoveFactory"/>
</bind>
<bind pointcut="execution(public * *->*(..))">
<interceptor-ref name="org.jboss.ejb3.stateful.StatefulInstanceInterceptor"/>
<interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
<interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
</bind>
<bind pointcut="execution(public * $instanceof{javax.ejb.SessionSynchronization}->*(..))">
<interceptor-ref name="org.jboss.ejb3.stateful.SessionSynchronizationInterceptor"/>
</bind>
<bind pointcut="execution(public * *->*(..))">
<interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
</bind>
<bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
<interceptor-ref name="org.jboss.ejb3.cache.StatefulReplicationInterceptor"/>
</bind>
<annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
@org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
</annotation>
</domain>
<domain name="Stateful Bean" extends="Base Stateful Bean" inheritBindings="true">
<!-- NON Clustered cache configuration -->
<annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND !class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.simple.SimpleStatefulCache.class)
</annotation>
<annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.PersistenceManager) AND !class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.simple.PersistenceManager (org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager.class)
</annotation>
<annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.CacheConfig) AND !class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.simple.CacheConfig (maxSize=100000, idleTimeoutSeconds=300)
</annotation>
<!-- Clustered cache configuration -->
<annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.tree.StatefulTreeCache.class)
</annotation>
<annotation expr="!class(@org.jboss.annotation.ejb.cache.tree.CacheConfig) AND class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.tree.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300)
</annotation>
</domain>
<domain name="JACC Stateful Bean">
<bind pointcut="execution(public * *->*(..))">
<interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
<interceptor-ref name="JACC Authorization"/>
</bind>
<bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
<interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
<interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * *->@javax.ejb.Remove(..))">
<interceptor-ref name="org.jboss.ejb3.stateful.StatefulRemoveFactory"/>
</bind>
<bind pointcut="execution(public * *->*(..))">
<interceptor-ref name="org.jboss.ejb3.stateful.StatefulInstanceInterceptor"/>
<interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
<interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
</bind>
<bind pointcut="execution(public * $instanceof{javax.ejb.SessionSynchronization}->*(..))">
<interceptor-ref name="org.jboss.ejb3.stateful.SessionSynchronizationInterceptor"/>
</bind>
<bind pointcut="execution(public * *->*(..))">
<interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
</bind>
<bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
<interceptor-ref name="org.jboss.ejb3.cache.StatefulReplicationInterceptor"/>
</bind>
<annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
@org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
</annotation>
<!-- NON Clustered cache configuration -->
<annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND !class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.simple.SimpleStatefulCache.class)
</annotation>
<annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.PersistenceManager) AND !class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.simple.PersistenceManager (org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager.class)
</annotation>
<annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.CacheConfig) AND !class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.simple.CacheConfig (maxSize=100000, idleTimeoutSeconds=300)
</annotation>
<!-- Clustered cache configuration -->
<annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.tree.StatefulTreeCache.class)
</annotation>
<annotation expr="!class(@org.jboss.annotation.ejb.cache.tree.CacheConfig) AND class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.tree.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300)
</annotation>
</domain>
<domain name="Embedded Stateful Bean" extends="Base Stateful Bean" inheritBindings="true">
<!-- NON Clustered cache configuration -->
<annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache)">
@org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.NoPassivationCache.class)
</annotation>
</domain>
<domain name="Message Driven Bean">
<bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
<interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * *->*(..))">
<interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
<interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
</bind>
<annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
@org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.StrictMaxPool.class, maxSize=30, timeout=10000)
</annotation>
</domain>
<domain name="Consumer Bean">
<bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
<interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * *->*(..))">
<interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
<interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
</bind>
<bind pointcut="execution(public * *->*(..)) AND (has(* *->@org.jboss.annotation.ejb.CurrentMessage(..)) OR hasfield(* *->@org.jboss.annotation.ejb.CurrentMessage))">
<interceptor-ref name="org.jboss.ejb3.mdb.CurrentMessageInjectorInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * *->*(..))">
<interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
</bind>
<annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
@org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.StrictMaxPool.class, maxSize=30, timeout=10000)
</annotation>
</domain>
<domain name="Service Bean">
<bind pointcut="execution(public * *->*(..))">
<interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
</bind>
<bind pointcut="!execution(* *->create()) AND !execution(* *->start()) AND !execution(*->new(..))">
<interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
<interceptor-ref name="Basic Authorization"/>
</bind>
<bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
<interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * *->*(..))">
<interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
<interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
</bind>
<bind pointcut="execution(public * *->*(..)) AND !execution(* *->create()) AND !execution(* *->start())">
<interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
</bind>
</domain>
<domain name="JACC Service Bean">
<bind pointcut="execution(public * *->*(..))">
<interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
</bind>
<bind pointcut="!execution(* *->create()) AND !execution(* *->start()) AND !execution(*->new(..))">
<interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
<interceptor-ref name="Basic Authorization"/>
</bind>
<bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
<interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * *->*(..))">
<interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
<interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
</bind>
<bind pointcut="execution(public * *->*(..)) AND !execution(* *->create()) AND !execution(* *->start())">
<interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
</bind>
</domain>
</aop>
1.1 plugins/samples/timetracker-ejb3/core/src/test/resources/jboss-jms-beans.xml
Index: jboss-jms-beans.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
xmlns="urn:jboss:bean-deployer">
<bean name="jboss.mq:service=JMSProviderLoader,name=JMSProvider" class="org.jboss.jms.jndi.JNDIProviderAdapter">
<property name="factoryRef">java:/XAConnectionFactory</property>
<property name="queueFactoryRef">java:/XAConnectionFactory</property>
<property name="topicFactoryRef">java:/XAConnectionFactory</property>
<property name="properties" class="java.util.Properties">
<map keyClass="java.lang.String" valueClass="java.lang.String">
<entry>
<key>java.naming.factory.initial</key>
<value>org.jnp.interfaces.LocalOnlyContextFactory</value>
</entry>
<entry>
<key>java.naming.factory.url.pkgs</key>
<value>org.jboss.naming:org.jnp.interfaces</value>
</entry>
</map>
</property>
</bean>
<bean name="b1" class="org.jboss.ejb3.embedded.JndiBinder">
<property name="jndiProperties"><inject bean="InitialContextProperties"/></property>
<property name="target"><inject bean="jboss.mq:service=JMSProviderLoader,name=JMSProvider"/></property>
<property name="bindTo">java:/DefaultJMSProvider</property>
<property name="serializable">true</property>
</bean>
<bean name="jboss.mq:service=ServerSessionPoolMBean,name=StdJMSPool" class="org.jboss.jms.asf.StdServerSessionPoolFactory">
<property name="name">StdJMSPool</property>
<property name="xidFactory"><inject bean="XidFactoryMBean"/></property>
<property name="transactionManager"><inject bean="TransactionManager"/></property>
</bean>
<bean name="b2" class="org.jboss.ejb3.embedded.JndiBinder">
<property name="jndiProperties"><inject bean="InitialContextProperties"/></property>
<property name="target"><inject bean="jboss.mq:service=ServerSessionPoolMBean,name=StdJMSPool"/></property>
<property name="bindTo">java:/StdJMSPool</property>
<property name="serializable">false</property>
</bean>
<bean name="jboss.mq:service=PersistenceManager" class="org.jboss.mq.kernel.JDBC2PersistenceManager">
<property name="transactionManager">
<inject bean="TransactionManager"/>
</property>
<property name="datasource">
<inject bean="DefaultDS"/>
</property>
<property name="sqlProperties">
BLOB_TYPE=OBJECT_BLOB
INSERT_TX = INSERT INTO JMS_TRANSACTIONS (TXID) values(?)
INSERT_MESSAGE = INSERT INTO JMS_MESSAGES (MESSAGEID, DESTINATION, MESSAGEBLOB, TXID, TXOP) VALUES(?,?,?,?,?)
SELECT_ALL_UNCOMMITED_TXS = SELECT TXID FROM JMS_TRANSACTIONS
SELECT_MAX_TX = SELECT MAX(TXID) FROM JMS_MESSAGES
SELECT_MESSAGES_IN_DEST = SELECT MESSAGEID, MESSAGEBLOB FROM JMS_MESSAGES WHERE DESTINATION=?
SELECT_MESSAGE = SELECT MESSAGEID, MESSAGEBLOB FROM JMS_MESSAGES WHERE MESSAGEID=? AND DESTINATION=?
MARK_MESSAGE = UPDATE JMS_MESSAGES SET TXID=?, TXOP=? WHERE MESSAGEID=? AND DESTINATION=?
UPDATE_MESSAGE = UPDATE JMS_MESSAGES SET MESSAGEBLOB=? WHERE MESSAGEID=? AND DESTINATION=?
UPDATE_MARKED_MESSAGES = UPDATE JMS_MESSAGES SET TXID=?, TXOP=? WHERE TXOP=?
UPDATE_MARKED_MESSAGES_WITH_TX = UPDATE JMS_MESSAGES SET TXID=?, TXOP=? WHERE TXOP=? AND TXID=?
DELETE_MARKED_MESSAGES_WITH_TX = DELETE FROM JMS_MESSAGES WHERE TXOP=? AND JMS_MESSAGES.TXID IN (SELECT TXID FROM JMS_TRANSACTIONS)
DELETE_TX = DELETE FROM JMS_TRANSACTIONS WHERE TXID = ?
DELETE_MARKED_MESSAGES = DELETE FROM JMS_MESSAGES WHERE TXID=? AND TXOP=?
DELETE_MESSAGE = DELETE FROM JMS_MESSAGES WHERE MESSAGEID=? AND DESTINATION=?
CREATE_MESSAGE_TABLE = CREATE CACHED TABLE JMS_MESSAGES ( MESSAGEID INTEGER NOT NULL, \
DESTINATION VARCHAR(255) NOT NULL, TXID INTEGER, TXOP CHAR(1), \
MESSAGEBLOB OBJECT, PRIMARY KEY (MESSAGEID, DESTINATION) )
CREATE_IDX_MESSAGE_TXOP_TXID = CREATE INDEX JMS_MESSAGES_TXOP_TXID ON JMS_MESSAGES (TXOP, TXID)
CREATE_IDX_MESSAGE_DESTINATION = CREATE INDEX JMS_MESSAGES_DESTINATION ON JMS_MESSAGES (DESTINATION)
CREATE_TX_TABLE = CREATE CACHED TABLE JMS_TRANSACTIONS ( TXID INTEGER, PRIMARY KEY (TXID) )
CREATE_TABLES_ON_STARTUP = TRUE
DELETE_TEMPORARY_MESSAGES = DELETE FROM JMS_MESSAGES WHERE TXOP='T'
</property>
</bean>
<bean name="jboss.mq:service=MessageCache" class="org.jboss.mq.kernel.MessageCache">
<property name="persistenceManager"><inject bean="jboss.mq:service=PersistenceManager"/></property>
<property name="highMemoryMark">50</property>
<property name="maxMemoryMark">60</property>
</bean>
<bean name="jms-rar-WorkManager" class="org.jboss.ejb3.embedded.resource.JBossWorkManager">
</bean>
<bean name="jms-rar-DeploymentInfo" class="org.jboss.ejb3.embedded.resource.Ejb3DeploymentInfo">
<constructor>
<parameter class="java.lang.String">jms-ra.rar</parameter>
<parameter class="java.lang.String">javax.jms.MessageListener</parameter>
<parameter class="java.lang.String">org.jboss.resource.adapter.jms.inflow.JmsActivationSpec</parameter>
</constructor>
</bean>
<bean name="jboss.jca:name='jms-ra.rar',service=RARDeployment" class="org.jboss.ejb3.embedded.resource.RARDeployment">
<constructor>
<parameter class="org.jboss.deployment.DeploymentInfo">
<inject bean="jms-rar-DeploymentInfo"/>
</parameter>
</constructor>
<property name="workManager"><inject bean="jms-rar-WorkManager"/></property>
</bean>
<bean name="jboss.mq:service=StateManager" class="org.jboss.mq.kernel.JDBCStateManager">
<property name="transactionManager">
<inject bean="TransactionManager"/>
</property>
<property name="datasource">
<inject bean="DefaultDS"/>
</property>
<property name="sqlProperties">
CREATE_TABLES_ON_STARTUP = TRUE
CREATE_USER_TABLE = CREATE TABLE JMS_USERS (USERID VARCHAR(32) NOT NULL, PASSWD VARCHAR(32) NOT NULL, \
CLIENTID VARCHAR(128), PRIMARY KEY(USERID))
CREATE_ROLE_TABLE = CREATE TABLE JMS_ROLES (ROLEID VARCHAR(32) NOT NULL, USERID VARCHAR(32) NOT NULL, \
PRIMARY KEY(USERID, ROLEID))
CREATE_SUBSCRIPTION_TABLE = CREATE TABLE JMS_SUBSCRIPTIONS (CLIENTID VARCHAR(128) NOT NULL, \
SUBNAME VARCHAR(128) NOT NULL, TOPIC VARCHAR(255) NOT NULL, \
SELECTOR VARCHAR(255), PRIMARY KEY(CLIENTID, SUBNAME))
GET_SUBSCRIPTION = SELECT TOPIC, SELECTOR FROM JMS_SUBSCRIPTIONS WHERE CLIENTID=? AND SUBNAME=?
LOCK_SUBSCRIPTION = SELECT TOPIC, SELECTOR FROM JMS_SUBSCRIPTIONS WHERE CLIENTID=? AND SUBNAME=?
GET_SUBSCRIPTIONS_FOR_TOPIC = SELECT CLIENTID, SUBNAME, SELECTOR FROM JMS_SUBSCRIPTIONS WHERE TOPIC=?
INSERT_SUBSCRIPTION = INSERT INTO JMS_SUBSCRIPTIONS (CLIENTID, SUBNAME, TOPIC, SELECTOR) VALUES(?,?,?,?)
UPDATE_SUBSCRIPTION = UPDATE JMS_SUBSCRIPTIONS SET TOPIC=?, SELECTOR=? WHERE CLIENTID=? AND SUBNAME=?
REMOVE_SUBSCRIPTION = DELETE FROM JMS_SUBSCRIPTIONS WHERE CLIENTID=? AND SUBNAME=?
GET_USER_BY_CLIENTID = SELECT USERID, PASSWD, CLIENTID FROM JMS_USERS WHERE CLIENTID=?
GET_USER = SELECT PASSWD, CLIENTID FROM JMS_USERS WHERE USERID=?
POPULATE.TABLES.01 = INSERT INTO JMS_USERS (USERID, PASSWD) VALUES ('guest', 'guest')
POPULATE.TABLES.02 = INSERT INTO JMS_USERS (USERID, PASSWD) VALUES ('j2ee', 'j2ee')
POPULATE.TABLES.03 = INSERT INTO JMS_USERS (USERID, PASSWD, CLIENTID) VALUES ('john', 'needle', 'DurableSubscriberExample')
POPULATE.TABLES.04 = INSERT INTO JMS_USERS (USERID, PASSWD) VALUES ('nobody', 'nobody')
POPULATE.TABLES.05 = INSERT INTO JMS_USERS (USERID, PASSWD) VALUES ('dynsub', 'dynsub')
POPULATE.TABLES.06 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('guest','guest')
POPULATE.TABLES.07 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('j2ee','guest')
POPULATE.TABLES.08 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('john','guest')
POPULATE.TABLES.09 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('subscriber','john')
POPULATE.TABLES.10 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('publisher','john')
POPULATE.TABLES.11 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('publisher','dynsub')
POPULATE.TABLES.12 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('durpublisher','john')
POPULATE.TABLES.13 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('durpublisher','dynsub')
POPULATE.TABLES.14 = INSERT INTO JMS_ROLES (ROLEID, USERID) VALUES ('noacc','nobody')
</property>
</bean>
<bean name="BasicQueueParameters" class="org.jboss.mq.server.BasicQueueParameters"/>
<bean name="jboss.mq:service=ThreadPool" class="org.jboss.util.threadpool.BasicThreadPool">
<property name="name">JMSThread</property>
<property name="threadGroupName">JBossMQ Server Threads</property>
<!-- The max number of threads in the pool -->
<property name="maximumPoolSize">10</property>
<!-- The max number of tasks before the queue is full -->
<property name="maximumQueueSize">1000</property>
<!-- The behavior of the pool when a task is added and the queue is full.
abort - a RuntimeException is thrown
run - the calling thread executes the task
wait - the calling thread blocks until the queue has room
discard - the task is silently discarded without being run
discardOldest - check to see if a task is about to complete and enque
the new task if possible, else run the task in the calling thread
-->
<property name="blockingModeString">run</property>
</bean>
<bean name="jboss.mq:service=DestinationManager" class="org.jboss.mq.server.JMSDestinationManager">
<constructor>
<parameter class="org.jboss.mq.server.BasicQueueParameters">
<inject bean="BasicQueueParameters"/>
</parameter>
</constructor>
<property name="persistenceManager"><inject bean="jboss.mq:service=PersistenceManager"/></property>
<property name="messageCache"><inject bean="jboss.mq:service=MessageCache"/></property>
<property name="stateManager"><inject bean="jboss.mq:service=StateManager"/></property>
<property name="threadPool"><inject bean="jboss.mq:service=ThreadPool"/></property>
<property name="threadGroup"><inject bean="jboss.mq:service=ThreadPool" property="threadGroup"/></property>
<start method="startServer"/>
<stop method="stopServer"/>
</bean>
<bean name="jboss.mq.destination:service=Queue,name=DLQ" class="org.jboss.mq.kernel.Queue">
<property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
<property name="initialContextProperties"><inject bean="InitialContextProperties"/><...
[truncated message content] |
|
From: Vance K. <va...@us...> - 2007-02-06 02:54:07
|
User: vancek Date: 07/02/05 18:54:04 plugins/samples/timetracker-ejb3/common/src/main/java/org/andromda/timetracker/security - New directory |
|
From: Vance K. <va...@us...> - 2007-02-06 02:54:05
|
User: vancek Date: 07/02/05 18:54:05 plugins/samples/timetracker-ejb3/core/src/test/java/org/andromda/timetracker/service/test - New directory |
|
From: Vance K. <va...@us...> - 2007-02-05 13:14:52
|
User: vancek
Date: 07/02/05 05:14:51
Modified: andromda-ejb3/src/site/fml faq.fml
Log:
add MalformedURLException faq
Revision Changes Path
1.5 +16 -0 cartridges/andromda-ejb3/src/site/fml/faq.fml
Index: faq.fml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/fml/faq.fml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- faq.fml 11 Aug 2006 05:51:08 -0000 1.4
+++ faq.fml 5 Feb 2007 13:14:51 -0000 1.5
@@ -92,5 +92,21 @@
</p>
</answer>
</faq>
+ <faq id="MalformedURLException_with_Tests">
+ <question>I am getting "java.net.MalformedURLException: no protocol: and" when running the test!</question>
+ <answer>
+ <p>
+ This is a class loader issue where somewhere in the JBoss Microcontainer, the URL referencing your
+ Maven 2 repository is not encoded and you have spaces in this URL. This is particularly the case
+ if you are running under a Windows OS platform and your default Maven 2 repository is
+ C:\Documents and Settings\username\.m2\repository. The problem is the space in the URL!
+ </p>
+ <p>
+ You need to move your repository to a location on your filesystem without spaces and update/add
+ the <i>settings.xml</i> in your .m2 folder to set the <i>localRepository</i> element to
+ this new location. Here is the <a href="http://maven.apache.org/settings.html">Maven settings guide</a>.
+ </p>
+ </answer>
+ </faq>
</part>
</faqs>
|
|
From: Vance K. <va...@us...> - 2007-02-05 00:40:29
|
User: vancek
Date: 07/02/04 16:40:30
Modified: andromda-ejb3/src/site/axdoc howto22.xml
Log:
add links for viewing generated config files
Revision Changes Path
1.2 +25 -0 cartridges/andromda-ejb3/src/site/axdoc/howto22.xml
Index: howto22.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/axdoc/howto22.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- howto22.xml 4 Feb 2007 04:18:18 -0000 1.1
+++ howto22.xml 5 Feb 2007 00:40:30 -0000 1.2
@@ -51,6 +51,31 @@
<a name="Configuration"/>
<subsection name="Configuration">
<p>
+ The following are typical testing configuration files generated for an <i>ejb3</i> project.
+ </p>
+ <p>
+ <ul>
+ <li class="gen">Auto-generated source that does not need manual editing</li>
+ <li class="impl">Auto-generated source that should be edited manually</li>
+ <li class="changed">File that is affected by the modifications applied in this section</li>
+ </ul>
+ </p>
+ <p>
+ <ul>
+ <li class="impl"><a class="changed" href="howto/org/andromda/test/default.persistence.properties"><code>default.persistence.properties</code></a></li>
+ <li class="impl"><a class="changed" href="howto/org/andromda/test/ejb3-interceptors-aop.xml"><code>ejb3-interceptors-aop.xml</code></a></li>
+ <li class="impl"><a class="changed" href="howto/org/andromda/test/embedded-jboss-beans.xml"><code>embedded-jboss-beans.xml</code></a></li>
+ <li class="impl"><a class="changed" href="howto/org/andromda/test/jboss-jms-beans.xml"><code>jboss-jms-beans.xml</code></a></li>
+ <li class="impl"><a class="changed" href="howto/org/andromda/test/jndi.properties"><code>jndi.properties</code></a></li>
+ <li class="impl"><a class="changed" href="howto/org/andromda/test/log4j.xml"><code>log4j.xml</code></a></li>
+ <li class="impl"><a class="changed" href="howto/org/andromda/test/login-config.xml"><code>login-config.xml</code></a></li>
+ <li class="impl"><a class="changed" href="howto/org/andromda/test/security-beans.xml"><code>security-beans.xml</code></a></li>
+ <li class="impl"><a class="changed" href="howto/org/andromda/test/roles.properties"><code>roles.properties</code></a></li>
+ <li class="impl"><a class="changed" href="howto/org/andromda/test/users.properties"><code>users.properties</code></a></li>
+ <li class="impl"><a class="changed" href="howto/org/andromda/test/testng.xml"><code>testng.xml</code></a></li>
+ </ul>
+ </p>
+ <p>
When you first run <i>mvn</i> over your project, the cartridge will generate all the
JBoss Embeddable container configuration files in <code>core/src/test/resources</code>.
All these files are generated ONCE ONLY and will NOT be over-written. You can safely make
|
