February 2009 - jboss-identity-commits

JBoss Identity SVN: r304 - idm/trunk/idm.

by jboss-identity-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2009-02-03 13:32:35 -0500 (Tue, 03 Feb 2009) New Revision: 304 Modified: idm/trunk/idm/.classpath Log: fix classpath for eclipse Modified: idm/trunk/idm/.classpath =================================================================== --- idm/trunk/idm/.classpath 2009-02-03 16:24:44 UTC (rev 303) +++ idm/trunk/idm/.classpath 2009-02-03 18:32:35 UTC (rev 304) @@ -13,5 +13,6 @@ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.3.1.ga/hibernate-entitymanager-3.3.1.ga.jar"/> <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.4.ga/hibernate-3.2.4.ga.jar"/> <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/cache/jbosscache-core/3.0.2.GA/jbosscache-core-3.0.2.GA.jar"/> <classpathentry kind="output" path="target/eclipse-classes"/> </classpath>

15 years, 3 months

1
0
0 / 0

JBoss Identity SVN: r300 - in idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl: model/hibernate and 4 other directories.

by jboss-identity-commits＠lists.jboss.org

Author: bdaw Date: 2009-02-03 09:16:11 -0500 (Tue, 03 Feb 2009) New Revision: 300 Added: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/cache/JBossCacheAttributeStoreWrapper.java Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/cache/IdentityStoreCacheSupport.java idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/cache/JBossCacheIdentityStoreWrapper.java idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObject.java idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/ldap/LDAPIdentityObjectImpl.java idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/repository/AbstractIdentityStoreRepository.java idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/types/SimpleIdentityObject.java Log: ++ for caching Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/cache/IdentityStoreCacheSupport.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/cache/IdentityStoreCacheSupport.java 2009-02-03 12:54:58 UTC (rev 299) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/cache/IdentityStoreCacheSupport.java 2009-02-03 14:16:11 UTC (rev 300) @@ -42,8 +42,10 @@ import java.util.HashSet; /** + * Helper class providing caching support for IdentityStore. Stores search methods results using hash from a set of used + * IdentityObjectSearchControl objects as a key. * * - * TODO: update the structure... + * TODO: update cache tree structure documentation to all used nodes/keys... * Cache structure: * * CACHE_ROOT (real) @@ -80,10 +82,7 @@ public abstract class IdentityStoreCacheSupport { - // TODO: more logging... - - // Node paths - + //Structure public static final String JBID_ROOT_NODE = "/jboss_id_idm"; public static final String OBJECT_TYPES_NODE = JBID_ROOT_NODE + "/object_types"; @@ -561,6 +560,13 @@ node.put(NODE_SEARCH_RESULTS_KEY, results); + if (getLog().isLoggable(Level.FINER)) + { + getLog().finer(this.toString() + "IdentityObjectRelationship search stored in cache: fromIdentity" + + fromIdentity.toString() + "; toIdentity=" + toIdentity.toString() + + "; relationshipType=" + relationshipType.getName() ) ; + } + } @@ -574,6 +580,13 @@ if (node != null) { + if (node.getKeys().contains(NODE_SEARCH_RESULTS_KEY) && getLog().isLoggable(Level.FINER)) + { + getLog().finer(this.toString() + "IdentityObjectRelationship search found in cache: fromIdentity" + + fromIdentity.toString() + "; toIdentity=" + toIdentity.toString() + + "; relationshipType=" + relationshipType.getName() ) ; + } + return (Set<IdentityObjectRelationship>)node.get(NODE_SEARCH_RESULTS_KEY); } return null; @@ -591,6 +604,16 @@ node.put(NODE_SEARCH_RESULTS_KEY, results); + if (getLog().isLoggable(Level.FINER)) + { + getLog().finer(this.toString() + "IdentityObjectRelationship search stored in cache: " + + "identity" + identity.toString() + + "; relationshipType=" + relationshipType.getName() + + "; parent=" + parent + + "; named=" + named + + "; name=" + name) ; + } + } @@ -604,11 +627,23 @@ Fqn fqn = createRelationshipsComplexSearchFqn(identity, relationshipType, parent, named, name); Node node = getCache().getRoot().getChild(fqn); + Set<IdentityObjectRelationship> results = null; + if (node != null) { - return (Set<IdentityObjectRelationship>)node.get(NODE_SEARCH_RESULTS_KEY); + results = (Set<IdentityObjectRelationship>)node.get(NODE_SEARCH_RESULTS_KEY); + + if (results != null && getLog().isLoggable(Level.FINER)) + { + getLog().finer(this.toString() + "IdentityObjectRelationship search found in cache: " + + "identity" + identity.toString() + + "; relationshipType=" + relationshipType.getName() + + "; parent=" + parent + + "; named=" + named + + "; name=" + name) ; + } } - return null; + return results; } @@ -620,6 +655,11 @@ // It can be in any result in the type searches removeNodeChildren(OBJECT_TYPES_SEARCH_NODE); + + if (getLog().isLoggable(Level.FINER)) + { + getLog().finer(this.toString() + "IdentityObject searches invalidated in cache: identityObject=" + io.toString()); + } } protected void putIdentityObjectCountIntoCache(IdentityObjectType identityType, int count) @@ -629,6 +669,13 @@ node.put(NODE_OBJECT_KEY, count); + if (getLog().isLoggable(Level.FINER)) + { + getLog().finer(this.toString() + "IdentityObjectType count search strored in cache: " + + "identityObjectType=" + identityType.getName() + + "; count=" + count); + } + } protected int getIdentityObjectCountFromCache(IdentityObjectType identityType) @@ -639,7 +686,17 @@ if (node != null && node.getKeys().contains(NODE_OBJECT_KEY)) { - return (Integer)(node.get(NODE_OBJECT_KEY)); + int count = (Integer)(node.get(NODE_OBJECT_KEY)); + + if (getLog().isLoggable(Level.FINER)) + { + getLog().finer(this.toString() + "IdentityObjectType count search result found in cache: " + + "identityObjectType=" + identityType.getName() + + "; count=" + count); + } + + return count; + } // -1 means nothing in cache return -1; @@ -652,6 +709,12 @@ Node node = getCache().getRoot().addChild(fqn); node.remove(NODE_OBJECT_KEY); + + if (getLog().isLoggable(Level.FINER)) + { + getLog().finer(this.toString() + "IdentityObjectType count search result invalidated in cache: " + + "identityObjectType=" + identityType.getName()); + } } protected void invalidateCachedRelationshipSearches(IdentityObject fromIdentity, @@ -685,6 +748,13 @@ fqn = Fqn.fromElements(RELATIONSHIPS_SEARCH_COMPLEX_NODE, toName, false, relationshipType.getName(), relNameElement); getCache().getRoot().removeChild(fqn); + if (getLog().isLoggable(Level.FINER)) + { + getLog().finer(this.toString() + "IdentityObjectRelationship search result invalidated in cache: fromIdentity" + + fromIdentity.toString() + "; toIdentity=" + toIdentity.toString() + + "; relationshipType=" + relationshipType.getName() ) ; + } + } protected void invalidateCachedRelationshipSearches(IdentityObject identity1, IdentityObject identity2, boolean named) @@ -716,6 +786,13 @@ getCache().getRoot().removeChild(Fqn.fromElements(fqn, childName, name2)); } + if (getLog().isLoggable(Level.FINER)) + { + getLog().finer(this.toString() + "IdentityObjectRelationship search result invalidated in cache for: identity1" + + identity1.toString() + "; identity2=" + identity2.toString() + + "; named=" + named ) ; + } + } protected void invalidateRelationshipNameSearches(String name) @@ -724,6 +801,12 @@ removeNodeChildren(RELATIONSHIP_NAMES_SEARCH_ALL_NODE); removeNodeChildren(RELATIONSHIP_NAMES_SEARCH_IO_NODE); + + if (getLog().isLoggable(Level.FINER)) + { + getLog().finer(this.toString() + "IdentityObjectRelationshipName search results invalidated in cache: name" + + name ) ; + } } @@ -737,6 +820,12 @@ node.put(NODE_SEARCH_RESULTS_KEY, results); + if (getLog().isLoggable(Level.FINER)) + { + getLog().finer(this.toString() + "IdentityObjectRelationshipName search results invalidated in cache: controls hash=" + + getControlsHash(controls)) ; + } + } protected Set<String> getRelationshipNamesSearchFromCache(IdentityObjectSearchControl[] controls) @@ -748,9 +837,18 @@ if (node != null) { - return (Set<String>)node.get(NODE_SEARCH_RESULTS_KEY); + Set<String> results = (Set<String>)node.get(NODE_SEARCH_RESULTS_KEY); + + if (results != null && getLog().isLoggable(Level.FINER)) + { + getLog().finer(this.toString() + "IdentityObjectRelationshipName search result found in cache: controls hash=" + + getControlsHash(controls)) ; + } + + return results; } + return null; } @@ -765,6 +863,13 @@ node.put(NODE_SEARCH_RESULTS_KEY, results); + if (results != null && getLog().isLoggable(Level.FINER)) + { + getLog().finer(this.toString() + "IdentityObjectRelationshipName search result stored in cache: " + + "controls hash=" + getControlsHash(controls) + + "identity=" + identity.toString()) ; + } + } protected Set<String> getRelationshipNamesSearchFromCache(IdentityObject identity, IdentityObjectSearchControl[] controls) @@ -777,7 +882,16 @@ if (node != null) { - return (Set<String>)node.get(NODE_SEARCH_RESULTS_KEY); + Set<String> results = (Set<String>)node.get(NODE_SEARCH_RESULTS_KEY); + + if (results != null && getLog().isLoggable(Level.FINER)) + { + getLog().finer(this.toString() + "IdentityObjectRelationshipName search result found in cache: " + + "controls hash=" + getControlsHash(controls) + + "identity=" + identity.toString()) ; + } + + return results; } return null; } Added: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/cache/JBossCacheAttributeStoreWrapper.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/cache/JBossCacheAttributeStoreWrapper.java (rev 0) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/cache/JBossCacheAttributeStoreWrapper.java 2009-02-03 14:16:11 UTC (rev 300) @@ -0,0 +1,218 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.identity.idm.impl.cache; + +import org.jboss.identity.idm.spi.store.AttributeStore; +import org.jboss.identity.idm.spi.store.IdentityStoreInvocationContext; +import org.jboss.identity.idm.spi.store.IdentityStoreSession; +import org.jboss.identity.idm.spi.model.IdentityObjectType; +import org.jboss.identity.idm.spi.model.IdentityObjectAttribute; +import org.jboss.identity.idm.spi.model.IdentityObject; +import org.jboss.identity.idm.spi.configuration.metadata.IdentityObjectAttributeMetaData; +import org.jboss.identity.idm.exception.IdentityException; +import org.jboss.cache.Cache; +import org.jboss.cache.CacheFactory; +import org.jboss.cache.DefaultCacheFactory; + +import java.util.logging.Logger; +import java.util.Set; +import java.util.Map; + +/** + * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class JBossCacheAttributeStoreWrapper extends IdentityStoreCacheSupport implements AttributeStore +{ + + private static Logger log = Logger.getLogger(JBossCacheAttributeStoreWrapper.class.getName()); + + private final AttributeStore attributeStore; + + protected final Cache cache; + + // if update/add/remove operation on attributes should result in getAttributes() query to store new set in cache + // with many updates it can add additional cost + private boolean reloadAttributesToCacheOnUpdate = true; + + + public JBossCacheAttributeStoreWrapper(AttributeStore attributeStore, String cacheConfigurationFile) + { + this.attributeStore = attributeStore; + + CacheFactory factory = new DefaultCacheFactory(); + + this.cache = factory.createCache(cacheConfigurationFile); + + this.cache.start(); + + } + + public String getId() + { + return attributeStore.getId(); + } + + public IdentityStoreSession createIdentityStoreSession() throws IdentityException + { + return attributeStore.createIdentityStoreSession(); + } + + public Set<String> getSupportedAttributeNames(IdentityStoreInvocationContext invocationContext, + IdentityObjectType identityType) throws IdentityException + { + // Doesn't need to be cached + return attributeStore.getSupportedAttributeNames(invocationContext, identityType); + } + + public Map<String, IdentityObjectAttributeMetaData> getAttributesMetaData(IdentityStoreInvocationContext invocationContext, + IdentityObjectType identityType) + { + // Doesn't need to be cached + return attributeStore.getAttributesMetaData(invocationContext, identityType); + } + + public Map<String, IdentityObjectAttribute> getAttributes(IdentityStoreInvocationContext invocationContext, + IdentityObject identity) throws IdentityException + { + Map<String, IdentityObjectAttribute> results = getAttributesFromCache(identity.getName(), identity.getIdentityType()); + + if (results == null) + { + results = attributeStore.getAttributes(invocationContext, identity); + + if (results != null && results.size() > 0) + { + putIntoCache(identity, results); + } + } + + return results; + } + + public IdentityObjectAttribute getAttribute(IdentityStoreInvocationContext invocationContext, + IdentityObject identity, + String name) throws IdentityException + { + Map<String, IdentityObjectAttribute> results = getAttributesFromCache(identity.getName(), identity.getIdentityType()); + + if (results != null && results.containsKey(name)) + { + return results.get(name); + } + else + { + return attributeStore.getAttribute(invocationContext, identity, name); + + //TODO: add this attribute to the node map + } + + } + + public void updateAttributes(IdentityStoreInvocationContext invocationCtx, + IdentityObject identity, + IdentityObjectAttribute[] attributes) throws IdentityException + { + attributeStore.updateAttributes(invocationCtx, identity, attributes); + + removeAttributesFromCache(identity); + + if (reloadAttributesToCacheOnUpdate) + { + Map<String, IdentityObjectAttribute> results = attributeStore.getAttributes(invocationCtx, identity); + + if (results != null && results.size() > 0) + { + putIntoCache(identity, results); + } + } + else + { + // update attributes in node map directly + } + + } + + public void addAttributes(IdentityStoreInvocationContext invocationCtx, + IdentityObject identity, + IdentityObjectAttribute[] attributes) throws IdentityException + { + attributeStore.addAttributes(invocationCtx, identity, attributes); + + removeAttributesFromCache(identity); + + if (reloadAttributesToCacheOnUpdate) + { + Map<String, IdentityObjectAttribute> results = attributeStore.getAttributes(invocationCtx, identity); + + if (results != null && results.size() > 0) + { + putIntoCache(identity, results); + } + } + else + { + // add attributes in node map directly + } + } + + public void removeAttributes(IdentityStoreInvocationContext invocationCtx, + IdentityObject identity, + String[] attributeNames) throws IdentityException + { + attributeStore.removeAttributes(invocationCtx, identity, attributeNames); + + removeAttributesFromCache(identity); + + if (reloadAttributesToCacheOnUpdate) + { + Map<String, IdentityObjectAttribute> results = attributeStore.getAttributes(invocationCtx, identity); + + if (results != null && results.size() > 0) + { + putIntoCache(identity, results); + } + } + else + { + // remove attributes in node map directly + } + } + + protected Logger getLog() + { + return log; + } + + protected Cache getCache() + { + return cache; + } + + @Override + public String toString() + { + return "JBossCacheAttributeStoreWrapper (AttributeStore=" + attributeStore.getId() + ")"; + } + +} Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/cache/JBossCacheIdentityStoreWrapper.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/cache/JBossCacheIdentityStoreWrapper.java 2009-02-03 12:54:58 UTC (rev 299) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/cache/JBossCacheIdentityStoreWrapper.java 2009-02-03 14:16:11 UTC (rev 300) @@ -56,7 +56,7 @@ * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ -public class JBossCacheIdentityStoreWrapper extends IdentityStoreCacheSupport implements IdentityStore +public class JBossCacheIdentityStoreWrapper extends JBossCacheAttributeStoreWrapper implements IdentityStore { private static Logger log = Logger.getLogger(JBossCacheIdentityStoreWrapper.class.getName()); @@ -66,25 +66,14 @@ private final IdentityStore identityStore; - private final Cache cache; - - // if update/add/remove operation on attributes should result in getAttributes() query to store new set in cache - // with many updates it can add additional cost - private boolean reloadAttributesToCacheOnUpdate = true; - public JBossCacheIdentityStoreWrapper(IdentityStore identityStore, String cacheConfigurationFile) throws IdentityException { + super(identityStore, cacheConfigurationFile); this.identityStore = identityStore; - Configuration config = new Configuration(); - CacheFactory factory = new DefaultCacheFactory(); - this.cache = factory.createCache(cacheConfigurationFile); - - this.cache.start(); - initResidentNodes(identityStore.getSupportedFeatures().getSupportedIdentityObjectTypes(), identityStore.getSupportedFeatures().getSupportedRelationshipTypes()); @@ -100,16 +89,8 @@ identityStore.bootstrap(configurationMD); } - public String getId() - { - return identityStore.getId(); - } + - public IdentityStoreSession createIdentityStoreSession() throws IdentityException - { - return identityStore.createIdentityStoreSession(); - } - public FeaturesMetaData getSupportedFeatures() { return identityStore.getSupportedFeatures(); @@ -418,137 +399,8 @@ identityStore.updateCredential(ctx, identityObject, credential); } - public Set<String> getSupportedAttributeNames(IdentityStoreInvocationContext invocationContext, - IdentityObjectType identityType) throws IdentityException - { - // Doesn't need to be cached - return identityStore.getSupportedAttributeNames(invocationContext, identityType); - } - public Map<String, IdentityObjectAttributeMetaData> getAttributesMetaData(IdentityStoreInvocationContext invocationContext, - IdentityObjectType identityType) - { - // Doesn't need to be cached - return identityStore.getAttributesMetaData(invocationContext, identityType); - } - public Map<String, IdentityObjectAttribute> getAttributes(IdentityStoreInvocationContext invocationContext, - IdentityObject identity) throws IdentityException - { - Map<String, IdentityObjectAttribute> results = getAttributesFromCache(identity.getName(), identity.getIdentityType()); - - if (results == null) - { - results = identityStore.getAttributes(invocationContext, identity); - - if (results != null && results.size() > 0) - { - putIntoCache(identity, results); - } - } - - return results; - } - - public IdentityObjectAttribute getAttribute(IdentityStoreInvocationContext invocationContext, - IdentityObject identity, - String name) throws IdentityException - { - Map<String, IdentityObjectAttribute> results = getAttributesFromCache(identity.getName(), identity.getIdentityType()); - - if (results != null && results.containsKey(name)) - { - return results.get(name); - } - else - { - return identityStore.getAttribute(invocationContext, identity, name); - - //TODO: add this attribute to the node map - } - - } - - public void updateAttributes(IdentityStoreInvocationContext invocationCtx, - IdentityObject identity, - IdentityObjectAttribute[] attributes) throws IdentityException - { - identityStore.updateAttributes(invocationCtx, identity, attributes); - - removeAttributesFromCache(identity); - - if (reloadAttributesToCacheOnUpdate) - { - Map<String, IdentityObjectAttribute> results = identityStore.getAttributes(invocationCtx, identity); - - if (results != null && results.size() > 0) - { - putIntoCache(identity, results); - } - } - else - { - // update attributes in node map directly - } - - } - - public void addAttributes(IdentityStoreInvocationContext invocationCtx, - IdentityObject identity, - IdentityObjectAttribute[] attributes) throws IdentityException - { - identityStore.addAttributes(invocationCtx, identity, attributes); - - removeAttributesFromCache(identity); - - if (reloadAttributesToCacheOnUpdate) - { - Map<String, IdentityObjectAttribute> results = identityStore.getAttributes(invocationCtx, identity); - - if (results != null && results.size() > 0) - { - putIntoCache(identity, results); - } - } - else - { - // add attributes in node map directly - } - } - - public void removeAttributes(IdentityStoreInvocationContext invocationCtx, - IdentityObject identity, - String[] attributeNames) throws IdentityException - { - identityStore.removeAttributes(invocationCtx, identity, attributeNames); - - removeAttributesFromCache(identity); - - if (reloadAttributesToCacheOnUpdate) - { - Map<String, IdentityObjectAttribute> results = identityStore.getAttributes(invocationCtx, identity); - - if (results != null && results.size() > 0) - { - putIntoCache(identity, results); - } - } - else - { - // remove attributes in node map directly - } - } - - protected Logger getLog() - { - return log; - } - - protected Cache getCache() - { - return cache; - } - @Override public String toString() { Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObject.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObject.java 2009-02-03 12:54:58 UTC (rev 299) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObject.java 2009-02-03 14:16:11 UTC (rev 300) @@ -320,4 +320,10 @@ { } + + @Override + public String toString() + { + return "IdentityObject[id=" + getId() + "; name=" + getName() + "; type=" + getIdentityType().getName() + "]"; + } } Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/ldap/LDAPIdentityObjectImpl.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/ldap/LDAPIdentityObjectImpl.java 2009-02-03 12:54:58 UTC (rev 299) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/ldap/LDAPIdentityObjectImpl.java 2009-02-03 14:16:11 UTC (rev 300) @@ -78,4 +78,10 @@ { } + + @Override + public String toString() + { + return "IdentityObject[id=" + getId() + "; name=" + getName() + "; type=" + getIdentityType().getName() + "]"; + } } Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/repository/AbstractIdentityStoreRepository.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/repository/AbstractIdentityStoreRepository.java 2009-02-03 12:54:58 UTC (rev 299) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/repository/AbstractIdentityStoreRepository.java 2009-02-03 14:16:11 UTC (rev 300) @@ -71,6 +71,8 @@ if (asId != null && bootstrappedAttributeStores.keySet().contains(asId)) { defaultAttributeStore = bootstrappedAttributeStores.get(asId); + + //TODO: cache wrap support } if (isId != null && bootstrappedIdentityStores.keySet().contains(isId)) Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-02-03 12:54:58 UTC (rev 299) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-02-03 14:16:11 UTC (rev 300) @@ -39,7 +39,6 @@ import org.hibernate.Query; import org.hibernate.SessionFactory; import org.hibernate.criterion.Restrictions; -import org.hibernate.ejb.HibernateEntityManager; import org.hibernate.ejb.HibernateEntityManagerFactory; import org.jboss.identity.idm.exception.IdentityException; import org.jboss.identity.idm.impl.api.AttributeFilterSearchControl; Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/types/SimpleIdentityObject.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/types/SimpleIdentityObject.java 2009-02-03 12:54:58 UTC (rev 299) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/types/SimpleIdentityObject.java 2009-02-03 14:16:11 UTC (rev 300) @@ -83,4 +83,10 @@ { } + + @Override + public String toString() + { + return "IdentityObject[id=" + getId() + "; name=" + getName() + "; type=" + getIdentityType().getName() + "]"; + } } \ No newline at end of file

15 years, 3 months

1
0
0 / 0

JBoss Identity SVN: r299 - in idm/trunk: idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate and 2 other directories.

by jboss-identity-commits＠lists.jboss.org

Author: bdaw Date: 2009-02-03 07:54:58 -0500 (Tue, 03 Feb 2009) New Revision: 299 Modified: idm/trunk/example/maven2/src/test/java/org/jboss/identity/idm/example/DBTestCase.java idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObject.java idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationship.java idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipName.java idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipType.java idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectType.java idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateRealm.java idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreSessionImpl.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreTestCase.java Log: - Make HibernateIdentityStoreImpl use SessionFactory instead of HibernateEntityManagerFactory Modified: idm/trunk/example/maven2/src/test/java/org/jboss/identity/idm/example/DBTestCase.java =================================================================== --- idm/trunk/example/maven2/src/test/java/org/jboss/identity/idm/example/DBTestCase.java 2009-02-03 10:32:25 UTC (rev 298) +++ idm/trunk/example/maven2/src/test/java/org/jboss/identity/idm/example/DBTestCase.java 2009-02-03 12:54:58 UTC (rev 299) @@ -26,6 +26,7 @@ import java.util.Random; import java.util.Map; import java.util.Arrays; +import java.util.Collection; import java.io.File; import org.jboss.identity.idm.api.IdentitySessionFactory; @@ -36,6 +37,7 @@ import org.jboss.identity.idm.api.RoleType; import org.jboss.identity.idm.api.AttributeDescription; import org.jboss.identity.idm.api.Attribute; +import org.jboss.identity.idm.api.IdentitySearchControl; import org.jboss.identity.idm.impl.api.IdentitySessionFactoryImpl; import org.jboss.identity.idm.impl.api.SimpleAttribute; import org.jboss.identity.idm.impl.api.model.SimpleGroupType; @@ -75,6 +77,10 @@ IdentitySession identitySession = identitySessionFactory.createIdentitySession("realm://JBossIdentityExample/SampleRealm"); identitySession.beginTransaction(); + Collection<Identity> identities = identitySession + .getPersistenceManager() + .findIdentity((IdentitySearchControl[])null); + GroupType ORGANIZATION = new SimpleGroupType("ORGANIZATION"); GroupType GROUP = new SimpleGroupType("GROUP"); Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObject.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObject.java 2009-02-03 10:32:25 UTC (rev 298) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObject.java 2009-02-03 12:54:58 UTC (rev 299) @@ -54,34 +54,52 @@ * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ -@NamedQueries({ - @NamedQuery( - name = "findIdentityObjectByNameAndType", - query = "select o from HibernateIdentityObject o where o.realm like :realm and o.name like :name and o.identityType.name like :typeName" - ), - @NamedQuery( - name = "findIdentityObjectsByType", - query = "select o from HibernateIdentityObject o where o.name like :nameFilter and o.realm like :realm and o.identityType.name like :typeName" - ), - @NamedQuery( - name = "findIdentityObjectsByTypeOrderedByNameAsc", - query = "select o from HibernateIdentityObject o where o.name like :nameFilter and o.realm like :realm and o.identityType.name like :typeName " + - "order by o.name asc" - ), - @NamedQuery( - name = "findIdentityObjectsByTypeOrderedByNameDesc", - query = "select o from HibernateIdentityObject o where o.name like :nameFilter and o.realm like :realm and o.identityType.name like :typeName " + - "order by o.name desc" - ), - @NamedQuery( - name = "countIdentityObjectsByType", - query = "select count(o.id) from HibernateIdentityObject o where o.realm like :realm and o.identityType.name like :typeName" - ) - }) +//@NamedQueries({ +// @NamedQuery( +// name = "findIdentityObjectByNameAndType", +// query = "select o from HibernateIdentityObject o where o.realm like :realm and o.name like :name and o.identityType.name like :typeName" +// ), +// @NamedQuery( +// name = "findIdentityObjectsByType", +// query = "select o from HibernateIdentityObject o where o.name like :nameFilter and o.realm like :realm and o.identityType.name like :typeName" +// ), +// @NamedQuery( +// name = "findIdentityObjectsByTypeOrderedByNameAsc", +// query = "select o from HibernateIdentityObject o where o.name like :nameFilter and o.realm like :realm and o.identityType.name like :typeName " + +// "order by o.name asc" +// ), +// @NamedQuery( +// name = "findIdentityObjectsByTypeOrderedByNameDesc", +// query = "select o from HibernateIdentityObject o where o.name like :nameFilter and o.realm like :realm and o.identityType.name like :typeName " + +// "order by o.name desc" +// ), +// @NamedQuery( +// name = "countIdentityObjectsByType", +// query = "select count(o.id) from HibernateIdentityObject o where o.realm like :realm and o.identityType.name like :typeName" +// ) +// }) @Entity @Table(name = "identity_obj", uniqueConstraints = {@UniqueConstraint(columnNames = {"NAME", "IDENTITY_TYPE", "REALM"})}) public class HibernateIdentityObject implements IdentityObject { + public static final String findIdentityObjectByNameAndType = + "select o from HibernateIdentityObject o where o.realm like :realm and o.name like :name and o.identityType.name like :typeName"; + + public static final String findIdentityObjectsByType = + "select o from HibernateIdentityObject o where o.name like :nameFilter and o.realm like :realm and o.identityType.name like :typeName"; + + public static final String findIdentityObjectsByTypeOrderedByNameAsc = + "select o from HibernateIdentityObject o where o.name like :nameFilter and o.realm like :realm and o.identityType.name like :typeName " + + "order by o.name asc"; + + public static final String findIdentityObjectsByTypeOrderedByNameDesc = + "select o from HibernateIdentityObject o where o.name like :nameFilter and o.realm like :realm and o.identityType.name like :typeName " + + "order by o.name desc"; + + public static final String countIdentityObjectsByType = + "select count(o.id) from HibernateIdentityObject o where o.realm like :realm and o.identityType.name like :typeName"; + + @Id @GeneratedValue private Long id; Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationship.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationship.java 2009-02-03 10:32:25 UTC (rev 298) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationship.java 2009-02-03 12:54:58 UTC (rev 299) @@ -42,21 +42,27 @@ * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ -@NamedQueries({ - @NamedQuery( - name = "findIdentityObjectRelationshipsByType", - query = "select r from HibernateIdentityObjectRelationship r where r.type.name like :typeName" - ), - @NamedQuery( - name = "findIdentityObjectRelationshipNamesByType", - query = "select r.name from HibernateIdentityObjectRelationship r where r.type.name like :typeName" - ) - }) +//@NamedQueries({ +// @NamedQuery( +// name = "findIdentityObjectRelationshipsByType", +// query = "select r from HibernateIdentityObjectRelationship r where r.type.name like :typeName" +// ), +// @NamedQuery( +// name = "findIdentityObjectRelationshipNamesByType", +// query = "select r.name from HibernateIdentityObjectRelationship r where r.type.name like :typeName" +// ) +// }) @Entity @Table(name="identity_relationship", uniqueConstraints = {@UniqueConstraint(columnNames = {"NAME", "TYPE", "FROM_IDENTITY", "TO_IDENTITY"})}) public class HibernateIdentityObjectRelationship implements IdentityObjectRelationship { + public static final String findIdentityObjectRelationshipsByType = + "select r from HibernateIdentityObjectRelationship r where r.type.name like :typeName"; + public static final String findIdentityObjectRelationshipNamesByType = + "select r.name from HibernateIdentityObjectRelationship r where r.type.name like :typeName"; + + @Id @GeneratedValue private Long id; Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipName.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipName.java 2009-02-03 10:32:25 UTC (rev 298) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipName.java 2009-02-03 12:54:58 UTC (rev 299) @@ -39,44 +39,75 @@ */ @Entity @Table(name="identity_relationship_name", uniqueConstraints = {@UniqueConstraint(columnNames = {"NAME", "REALM"})}) -@NamedQueries({ - @NamedQuery( - name = "findIdentityObjectRelationshipNameByName", - query = "select rn from HibernateIdentityObjectRelationshipName rn where rn.name like :name and rn.realm like :realm" - ), - @NamedQuery( - name = "findIdentityObjectRelationshipNames", - query = "select rn.name from HibernateIdentityObjectRelationshipName rn where rn.name like :nameFilter and rn.realm like :realm" - ), - @NamedQuery( - name = "findIdentityObjectRelationshipNamesOrderedByNameAsc", - query = "select rn.name from HibernateIdentityObjectRelationshipName rn where rn.name like :nameFilter and rn.realm like :realm " + - "order by rn.name asc" - ), - @NamedQuery( - name = "findIdentityObjectRelationshipNamesOrderedByNameDesc", - query = "select rn.name from HibernateIdentityObjectRelationshipName rn where rn.name like :nameFilter and rn.realm like :realm " + - "order by rn.name desc" - ), - @NamedQuery( - name = "findIdentityObjectRelationshipNamesForIdentityObject", - query = "select r.name.name from HibernateIdentityObjectRelationship r where " + - "r.fromIdentityObject like :identityObject or r.toIdentityObject like :identityObject" - ), - @NamedQuery( - name = "findIdentityObjectRelationshipNamesForIdentityObjectOrderedByNameAsc", - query = "select r.name.name from HibernateIdentityObjectRelationship r where " + +//@NamedQueries({ +// @NamedQuery( +// name = "findIdentityObjectRelationshipNameByName", +// query = "select rn from HibernateIdentityObjectRelationshipName rn where rn.name like :name and rn.realm like :realm" +// ), +// @NamedQuery( +// name = "findIdentityObjectRelationshipNames", +// query = "select rn.name from HibernateIdentityObjectRelationshipName rn where rn.name like :nameFilter and rn.realm like :realm" +// ), +// @NamedQuery( +// name = "findIdentityObjectRelationshipNamesOrderedByNameAsc", +// query = "select rn.name from HibernateIdentityObjectRelationshipName rn where rn.name like :nameFilter and rn.realm like :realm " + +// "order by rn.name asc" +// ), +// @NamedQuery( +// name = "findIdentityObjectRelationshipNamesOrderedByNameDesc", +// query = "select rn.name from HibernateIdentityObjectRelationshipName rn where rn.name like :nameFilter and rn.realm like :realm " + +// "order by rn.name desc" +// ), +// @NamedQuery( +// name = "findIdentityObjectRelationshipNamesForIdentityObject", +// query = "select r.name.name from HibernateIdentityObjectRelationship r where " + +// "r.fromIdentityObject like :identityObject or r.toIdentityObject like :identityObject" +// ), +// @NamedQuery( +// name = "findIdentityObjectRelationshipNamesForIdentityObjectOrderedByNameAsc", +// query = "select r.name.name from HibernateIdentityObjectRelationship r where " + +// "r.fromIdentityObject like :identityObject or r.toIdentityObject like :identityObject " + +// "order by r.name.name asc" +// ), +// @NamedQuery( +// name = "findIdentityObjectRelationshipNamesForIdentityObjectOrdereByNameDesc", +// query = "select r.name.name from HibernateIdentityObjectRelationship r where " + +// "r.fromIdentityObject like :identityObject or r.toIdentityObject like :identityObject " + +// "order by r.name.name desc") +//}) +public class HibernateIdentityObjectRelationshipName +{ + + public static final String findIdentityObjectRelationshipNameByName = + "select rn from HibernateIdentityObjectRelationshipName rn where rn.name like :name and rn.realm like :realm"; + + public static final String findIdentityObjectRelationshipNames = + "select rn.name from HibernateIdentityObjectRelationshipName rn where rn.name like :nameFilter and rn.realm like :realm"; + + public static final String findIdentityObjectRelationshipNamesOrderedByNameAsc = + "select rn.name from HibernateIdentityObjectRelationshipName rn where rn.name like :nameFilter and rn.realm like :realm " + + "order by rn.name asc"; + + public static final String findIdentityObjectRelationshipNamesOrderedByNameDesc = + "select rn.name from HibernateIdentityObjectRelationshipName rn where rn.name like :nameFilter and rn.realm like :realm " + + "order by rn.name desc"; + + public static final String findIdentityObjectRelationshipNamesForIdentityObject = + "select r.name.name from HibernateIdentityObjectRelationship r where " + + "r.fromIdentityObject like :identityObject or r.toIdentityObject like :identityObject"; + + public static final String findIdentityObjectRelationshipNamesForIdentityObjectOrderedByNameAsc = + "select r.name.name from HibernateIdentityObjectRelationship r where " + "r.fromIdentityObject like :identityObject or r.toIdentityObject like :identityObject " + - "order by r.name.name asc" - ), - @NamedQuery( - name = "findIdentityObjectRelationshipNamesForIdentityObjectOrdereByNameDesc", - query = "select r.name.name from HibernateIdentityObjectRelationship r where " + + "order by r.name.name asc"; + + public static final String findIdentityObjectRelationshipNamesForIdentityObjectOrdereByNameDesc = + "select r.name.name from HibernateIdentityObjectRelationship r where " + "r.fromIdentityObject like :identityObject or r.toIdentityObject like :identityObject " + - "order by r.name.name desc") -}) -public class HibernateIdentityObjectRelationshipName -{ + "order by r.name.name desc"; + + + @Id @GeneratedValue private Long id; Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipType.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipType.java 2009-02-03 10:32:25 UTC (rev 298) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipType.java 2009-02-03 12:54:58 UTC (rev 299) @@ -36,17 +36,21 @@ * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ -@NamedQueries({ - @NamedQuery( - name = "findIdentityObjectRelationshipTypeByName", - query = "select t from HibernateIdentityObjectRelationshipType t where t.name like :name" - ) - }) +//@NamedQueries({ +// @NamedQuery( +// name = "findIdentityObjectRelationshipTypeByName", +// query = "select t from HibernateIdentityObjectRelationshipType t where t.name like :name" +// ) +// }) @Entity @Table(name = "identity_relationship_type") public class HibernateIdentityObjectRelationshipType implements IdentityObjectRelationshipType { + public static final String findIdentityObjectRelationshipTypeByName = + "select t from HibernateIdentityObjectRelationshipType t where t.name like :name"; + + @Id @GeneratedValue private Long id; Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectType.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectType.java 2009-02-03 10:32:25 UTC (rev 298) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectType.java 2009-02-03 12:54:58 UTC (rev 299) @@ -46,6 +46,10 @@ @Table(name = "identity_obj_type") public class HibernateIdentityObjectType implements IdentityObjectType { + + public static final String findIdentityObjectTypeByName = + "select t from HibernateIdentityObjectType t where t.name like :name"; + @Id @GeneratedValue private Long id; Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateRealm.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateRealm.java 2009-02-03 10:32:25 UTC (rev 298) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateRealm.java 2009-02-03 12:54:58 UTC (rev 299) @@ -41,17 +41,20 @@ * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ -@NamedQueries({ - @NamedQuery( - name = "findIRealmByName", - query = "select o from HibernateRealm o where o.name like :name" - ) -}) +//@NamedQueries({ +// @NamedQuery( +// name = "findIRealmByName", +// query = "select o from HibernateRealm o where o.name like :name" +// ) +//}) @Entity @Table(name = "identity_realm", uniqueConstraints = {@UniqueConstraint(columnNames = {"NAME"})}) public class HibernateRealm { + public static final String findIRealmByName = + "select o from HibernateRealm o where o.name like :name"; + @Id @GeneratedValue private Long id; Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-02-03 10:32:25 UTC (rev 298) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-02-03 12:54:58 UTC (rev 299) @@ -33,12 +33,11 @@ import java.util.Map; import java.util.Set; -import javax.persistence.NoResultException; -import javax.persistence.Persistence; -import javax.persistence.Query; - import org.hibernate.Criteria; import org.hibernate.HibernateException; +import org.hibernate.Session; +import org.hibernate.Query; +import org.hibernate.SessionFactory; import org.hibernate.criterion.Restrictions; import org.hibernate.ejb.HibernateEntityManager; import org.hibernate.ejb.HibernateEntityManagerFactory; @@ -76,6 +75,10 @@ import org.jboss.identity.idm.spi.store.IdentityStoreInvocationContext; import org.jboss.identity.idm.spi.store.IdentityStoreSession; +import javax.persistence.Persistence; +import javax.naming.InitialContext; +import javax.naming.NamingException; + /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ @@ -104,6 +107,8 @@ public static final String PERSISTENCE_UNIT = "persistenceUnit"; + public static final String HIBERNATE_SESSION_FACTORY_JNDI_NAME = "hibernateSessionFactoryJNDIName"; + public static final String POPULATE_MEMBERSHIP_TYPES = "populateRelationshipTypes"; public static final String POPULATE_IDENTITY_OBJECT_TYPES = "populateIdentityObjectTypes"; @@ -122,7 +127,7 @@ private FeaturesMetaData supportedFeatures; - private HibernateEntityManagerFactory emFactory; + private SessionFactory sessionFactory; private boolean isRealmAware = false; @@ -175,9 +180,9 @@ String populateMembershipTypes = configurationMD.getOptionSingleValue(POPULATE_MEMBERSHIP_TYPES); String populateIdentityObjectTypes = configurationMD.getOptionSingleValue(POPULATE_IDENTITY_OBJECT_TYPES); - emFactory = bootstrapHibernateEntityManager(configurationMD); + sessionFactory = bootstrapHibernateSessionFactory(configurationMD); - HibernateEntityManager em = (HibernateEntityManager)emFactory.createEntityManager(); + Session hibernateSession = sessionFactory.openSession(); // Attribute mappings - helper structures @@ -217,7 +222,7 @@ try { - populateRelationshipTypes(em, memberships.toArray(new String[memberships.size()])); + populateRelationshipTypes(hibernateSession, memberships.toArray(new String[memberships.size()])); } catch (Exception e) { @@ -238,7 +243,7 @@ try { - populateObjectTypes(em, types.toArray(new String[types.size()])); + populateObjectTypes(hibernateSession, types.toArray(new String[types.size()])); } catch (Exception e) { @@ -251,7 +256,7 @@ { try { - populateCredentialTypes(em, supportedCredentialTypes.toArray(new String[supportedCredentialTypes.size()])); + populateCredentialTypes(hibernateSession, supportedCredentialTypes.toArray(new String[supportedCredentialTypes.size()])); } catch (Exception e) { @@ -280,12 +285,12 @@ try { - em.getTransaction().begin(); + hibernateSession.getTransaction().begin(); - realm = (HibernateRealm)em.getSession(). + realm = (HibernateRealm)hibernateSession. createCriteria(HibernateRealm.class).add(Restrictions.eq("name", DEFAULT_REALM_NAME)).uniqueResult(); - em.getTransaction().commit(); + hibernateSession.getTransaction().commit(); } catch (HibernateException e) @@ -295,24 +300,48 @@ if (realm == null) { - addRealm(em, DEFAULT_REALM_NAME); + addRealm(hibernateSession, DEFAULT_REALM_NAME); } + hibernateSession.flush(); + } - // this is separate method to allow easier testing - protected HibernateEntityManagerFactory bootstrapHibernateEntityManager(IdentityStoreConfigurationMetaData configurationMD) throws IdentityException + protected SessionFactory bootstrapHibernateSessionFactory(IdentityStoreConfigurationMetaData configurationMD) throws IdentityException { + String sfJNDIName = configurationMD.getOptionSingleValue(HIBERNATE_SESSION_FACTORY_JNDI_NAME); String persistenceUnit = configurationMD.getOptionSingleValue(PERSISTENCE_UNIT); - - if (persistenceUnit == null) + + if (sfJNDIName != null) { - throw new IdentityException("Persistence Unit not defined for IdentityStore: " + getId()); + try + { + return (SessionFactory)new InitialContext().lookup(sfJNDIName); + } + catch (NamingException e) + { + throw new IdentityException("Cannot obtain hibernate SessionFactory from provided JNDI name: " + sfJNDIName, e); + } } + else if (persistenceUnit != null) + { - return (HibernateEntityManagerFactory)Persistence.createEntityManagerFactory(persistenceUnit); + try + { + return ((HibernateEntityManagerFactory)Persistence.createEntityManagerFactory(persistenceUnit)).getSessionFactory(); + } + catch (Exception e) + { + throw new IdentityException("Cannot obtain hibernate SessionFactory using provided persistence unit name: "+ persistenceUnit, e); + } + } + + throw new IdentityException("Cannot obtain hibernate SessionFactory. None of supported options specified: " + + HIBERNATE_SESSION_FACTORY_JNDI_NAME + ", " + PERSISTENCE_UNIT); + + } @@ -320,7 +349,7 @@ { try { - return new HibernateIdentityStoreSessionImpl((HibernateEntityManager)emFactory.createEntityManager()); + return new HibernateIdentityStoreSessionImpl(sessionFactory.openSession()); } catch (Exception e) { @@ -361,16 +390,16 @@ checkIOType(identityObjectType); - HibernateEntityManager em = getHibernateEntityManager(ctx); + Session session = getHibernateSession(ctx); - HibernateRealm realm = getRealm(em, ctx); + HibernateRealm realm = getRealm(session, ctx); // Check if object with a given name and type is not present already - List<?> results = em.createNamedQuery("findIdentityObjectByNameAndType") + List<?> results = session.createQuery(HibernateIdentityObject.findIdentityObjectByNameAndType) .setParameter("realm", realm) .setParameter("name", name) .setParameter("typeName", identityObjectType.getName()) - .getResultList(); + .list(); if (results.size() != 0) { @@ -393,7 +422,7 @@ try { - getHibernateEntityManager(ctx).persist(io); + getHibernateSession(ctx).persist(io); } catch (Exception e) { @@ -408,7 +437,7 @@ { HibernateIdentityObject hibernateObject = safeGet(ctx, identity); - HibernateEntityManager hem = getHibernateEntityManager(ctx); + Session hibernateSession = getHibernateSession(ctx); try { @@ -418,7 +447,7 @@ relationship.getFromIdentityObject().getFromRelationships().remove(relationship); relationship.getToIdentityObject().getToRelationships().remove(relationship); - hem.remove(relationship); + hibernateSession.delete(relationship); } for (HibernateIdentityObjectRelationship relationship : hibernateObject.getToRelationships()) @@ -426,10 +455,10 @@ relationship.getFromIdentityObject().getFromRelationships().remove(relationship); relationship.getToIdentityObject().getToRelationships().remove(relationship); - hem.remove(relationship); + hibernateSession.delete(relationship); } - hem.remove(hibernateObject); + hibernateSession.delete(hibernateObject); } catch (Exception e) { @@ -443,16 +472,16 @@ HibernateIdentityObjectType jpaType = getHibernateIdentityObjectType(ctx, identityType); - HibernateEntityManager em = getHibernateEntityManager(ctx); + Session hibernateSession = getHibernateSession(ctx); int count; try { - count = ((Number)em - .createNamedQuery("countIdentityObjectsByType") + count = ((Number)hibernateSession + .createQuery(HibernateIdentityObject.countIdentityObjectsByType) .setParameter("typeName", jpaType.getName()) - .setParameter("realm", getRealm(em, ctx)) - .getSingleResult()).intValue(); + .setParameter("realm", getRealm(hibernateSession, ctx)) + .uniqueResult()).intValue(); } catch (Exception e) { @@ -476,16 +505,16 @@ HibernateIdentityObject hibernateObject = null; - HibernateEntityManager em = getHibernateEntityManager(ctx); + Session em = getHibernateSession(ctx); try { - hibernateObject = (HibernateIdentityObject)getHibernateEntityManager(ctx). - createNamedQuery("findIdentityObjectByNameAndType") + hibernateObject = (HibernateIdentityObject)getHibernateSession(ctx). + createQuery(HibernateIdentityObject.findIdentityObjectByNameAndType) .setParameter("realm", getRealm(em, ctx)) .setParameter("name", name) .setParameter("typeName", hibernateType.getName()) - .getSingleResult(); + .uniqueResult(); } catch (Exception e) { @@ -506,7 +535,7 @@ try { - hibernateObject = getHibernateEntityManager(ctx).find(HibernateIdentityObject.class, new Long(id)); + hibernateObject = (HibernateIdentityObject)getHibernateSession(ctx).get(HibernateIdentityObject.class, new Long(id)); } catch(Exception e) { @@ -559,7 +588,7 @@ List<IdentityObject> results; - HibernateEntityManager em = getHibernateEntityManager(ctx); + Session hibernateSession = getHibernateSession(ctx); try { @@ -570,16 +599,16 @@ { if (sortSearchControl.isAscending()) { - q = em.createNamedQuery("findIdentityObjectsByTypeOrderedByNameAsc"); + q = hibernateSession.createQuery(HibernateIdentityObject.findIdentityObjectsByTypeOrderedByNameAsc); } else { - q = em.createNamedQuery("findIdentityObjectsByTypeOrderedByNameDesc"); + q = hibernateSession.createQuery(HibernateIdentityObject.findIdentityObjectsByTypeOrderedByNameDesc); } } else { - q = em.createNamedQuery("findIdentityObjectsByType"); + q = hibernateSession.createQuery(HibernateIdentityObject.findIdentityObjectsByType); } if (pageSearchControl != null) @@ -592,7 +621,7 @@ } - q.setParameter("realm", getRealm(em, ctx)) + q.setParameter("realm", getRealm(hibernateSession, ctx)) .setParameter("typeName", hibernateType.getName()); if (nameFilterSearchControl != null) @@ -606,7 +635,7 @@ - results = (List<IdentityObject>)q.getResultList(); + results = (List<IdentityObject>)q.list(); } catch (Exception e) @@ -725,7 +754,7 @@ - q = getHibernateEntityManager(ctx).getSession().createQuery(hqlString.toString()) + q = getHibernateSession(ctx).createQuery(hqlString.toString()) .setParameter("relType", relationshipType.getName()) .setParameter("identity",hibernateObject); @@ -798,7 +827,7 @@ "beetween: [ " + fromIO.getIdentityType().getName() + " ] and [ " + toIO.getIdentityType().getName() + " ]"); } - org.hibernate.Query query = getHibernateEntityManager(ctx).getSession().createQuery(QUERY_RELATIONSHIP_BY_FROM_TO_TYPE_NAME) + org.hibernate.Query query = getHibernateSession(ctx).createQuery(QUERY_RELATIONSHIP_BY_FROM_TO_TYPE_NAME) .setParameter("fromIO", fromIO) .setParameter("toIO", toIO) .setParameter("typeName", type.getName()) @@ -816,7 +845,10 @@ if (name != null) { - HibernateIdentityObjectRelationshipName relationshipName = (HibernateIdentityObjectRelationshipName)getHibernateEntityManager(ctx).getSession().createCriteria(HibernateIdentityObjectRelationshipName.class).add(Restrictions.eq("name", name)).uniqueResult(); + HibernateIdentityObjectRelationshipName relationshipName = + (HibernateIdentityObjectRelationshipName)getHibernateSession(ctx). + createCriteria(HibernateIdentityObjectRelationshipName.class).add(Restrictions.eq("name", name)). + uniqueResult(); if (relationshipName == null) { @@ -830,7 +862,7 @@ relationship = new HibernateIdentityObjectRelationship(type, fromIO, toIO); } - getHibernateEntityManager(ctx).persist(relationship); + getHibernateSession(ctx).persist(relationship); return relationship; @@ -856,21 +888,24 @@ if (name == null) { - query = getHibernateEntityManager(ctx).getSession().createQuery(QUERY_RELATIONSHIP_BY_FROM_TO_TYPE) + query = getHibernateSession(ctx).createQuery(QUERY_RELATIONSHIP_BY_FROM_TO_TYPE) .setParameter("fromIO", fromIO) .setParameter("toIO", toIO) .setParameter("typeName", type.getName()); } else { - HibernateIdentityObjectRelationshipName relationshipName = (HibernateIdentityObjectRelationshipName)getHibernateEntityManager(ctx).getSession().createCriteria(HibernateIdentityObjectRelationshipName.class).add(Restrictions.eq("name", name)).uniqueResult(); + HibernateIdentityObjectRelationshipName relationshipName = + (HibernateIdentityObjectRelationshipName)getHibernateSession(ctx) + .createCriteria(HibernateIdentityObjectRelationshipName.class).add(Restrictions.eq("name", name)) + .uniqueResult(); if (relationshipName == null) { throw new IdentityException("Relationship name not present in the store"); } - query = getHibernateEntityManager(ctx).getSession().createQuery(QUERY_RELATIONSHIP_BY_FROM_TO_TYPE_NAME) + query = getHibernateSession(ctx).createQuery(QUERY_RELATIONSHIP_BY_FROM_TO_TYPE_NAME) .setParameter("fromIO", fromIO) .setParameter("toIO", toIO) .setParameter("typeName", type.getName()) @@ -889,7 +924,7 @@ fromIO.getFromRelationships().remove(relationship); toIO.getToRelationships().remove(relationship); - getHibernateEntityManager(ctx).remove(relationship); + getHibernateSession(ctx).delete(relationship); } @@ -898,7 +933,7 @@ HibernateIdentityObject hio1 = safeGet(ctx, identity1); HibernateIdentityObject hio2 = safeGet(ctx, identity2); - org.hibernate.Query query = getHibernateEntityManager(ctx).getSession().createQuery(QUERY_RELATIONSHIP_BY_IDENTITIES) + org.hibernate.Query query = getHibernateSession(ctx).createQuery(QUERY_RELATIONSHIP_BY_IDENTITIES) .setParameter("IO1", hio1) .setParameter("IO2", hio2); @@ -913,7 +948,7 @@ { relationship.getFromIdentityObject().getFromRelationships().remove(relationship); relationship.getToIdentityObject().getToRelationships().remove(relationship); - getHibernateEntityManager(ctx).remove(relationship); + getHibernateSession(ctx).delete(relationship); } } } @@ -931,11 +966,11 @@ if (relationshipType == null) { - query = getHibernateEntityManager(ctx).getSession().createQuery(QUERY_RELATIONSHIP_BY_FROM_TO); + query = getHibernateSession(ctx).createQuery(QUERY_RELATIONSHIP_BY_FROM_TO); } else { - query = getHibernateEntityManager(ctx).getSession().createQuery(QUERY_RELATIONSHIP_BY_FROM_TO_TYPE) + query = getHibernateSession(ctx).createQuery(QUERY_RELATIONSHIP_BY_FROM_TO_TYPE) .setParameter("typeName", relationshipType.getName()); } @@ -959,7 +994,7 @@ HibernateIdentityObject hio = safeGet(ctx, identity); - Criteria criteria = getHibernateEntityManager(ctx).getSession().createCriteria(HibernateIdentityObjectRelationship.class); + Criteria criteria = getHibernateSession(ctx).createCriteria(HibernateIdentityObjectRelationship.class); if (type != null) { @@ -1002,13 +1037,13 @@ throw new IllegalArgumentException("name is null"); } - HibernateEntityManager em = getHibernateEntityManager(ctx); + Session em = getHibernateSession(ctx); HibernateRealm realm = getRealm(em, ctx); try { - HibernateIdentityObjectRelationshipName hiorn = (HibernateIdentityObjectRelationshipName)em.getSession().createCriteria(HibernateIdentityObjectRelationshipName.class) + HibernateIdentityObjectRelationshipName hiorn = (HibernateIdentityObjectRelationshipName)em.createCriteria(HibernateIdentityObjectRelationshipName.class) .add(Restrictions.eq("name", name)).add(Restrictions.eq("realm", realm)).uniqueResult(); if (hiorn != null) @@ -1017,7 +1052,7 @@ } hiorn = new HibernateIdentityObjectRelationshipName(name, realm); - getHibernateEntityManager(ctx).persist(hiorn); + getHibernateSession(ctx).persist(hiorn); } catch (Exception e) @@ -1036,12 +1071,12 @@ throw new IllegalArgumentException("name is null"); } - HibernateEntityManager em = getHibernateEntityManager(ctx); + Session em = getHibernateSession(ctx); try { - HibernateIdentityObjectRelationshipName hiorn = (HibernateIdentityObjectRelationshipName)em.getSession().createCriteria(HibernateIdentityObjectRelationshipName.class) + HibernateIdentityObjectRelationshipName hiorn = (HibernateIdentityObjectRelationshipName)em.createCriteria(HibernateIdentityObjectRelationshipName.class) .add(Restrictions.eq("name", name)).add(Restrictions.eq("realm", getRealm(em, ctx))).uniqueResult(); if (hiorn == null) @@ -1049,7 +1084,7 @@ throw new IdentityException("Relationship name doesn't exist"); } - getHibernateEntityManager(ctx).remove(hiorn); + getHibernateSession(ctx).delete(hiorn); } catch (Exception e) @@ -1066,7 +1101,7 @@ Set<String> names = null; - HibernateEntityManager em = getHibernateEntityManager(ctx); + Session em = getHibernateSession(ctx); checkControls(controls); @@ -1107,16 +1142,16 @@ { if (sortSearchControl.isAscending()) { - q = em.createNamedQuery("findIdentityObjectRelationshipNamesOrderedByNameAsc"); + q = em.createQuery(HibernateIdentityObjectRelationshipName.findIdentityObjectRelationshipNamesOrderedByNameAsc); } else { - q = em.createNamedQuery("findIdentityObjectRelationshipNamesOrderedByNameDesc"); + q = em.createQuery(HibernateIdentityObjectRelationshipName.findIdentityObjectRelationshipNamesOrderedByNameDesc); } } else { - q = em.createNamedQuery("findIdentityObjectRelationshipNames"); + q = em.createQuery(HibernateIdentityObjectRelationshipName.findIdentityObjectRelationshipNames); } q.setParameter("realm", getRealm(em, ctx)); @@ -1140,7 +1175,7 @@ } } - List<String> results = (List<String>)q.getResultList(); + List<String> results = (List<String>)q.list(); names = new HashSet<String>(results); @@ -1165,7 +1200,7 @@ HibernateIdentityObject hibernateObject = safeGet(ctx, identity); - HibernateEntityManager em = getHibernateEntityManager(ctx); + Session em = getHibernateSession(ctx); checkControls(controls); @@ -1195,16 +1230,16 @@ { if (sortSearchControl.isAscending()) { - q = em.createNamedQuery("findIdentityObjectRelationshipNamesForIdentityObjectOrderedByNameAsc"); + q = em.createQuery(HibernateIdentityObjectRelationshipName.findIdentityObjectRelationshipNamesForIdentityObjectOrderedByNameAsc); } else { - q = em.createNamedQuery("findIdentityObjectRelationshipNamesForIdentityObjectOrderedByNameDesc"); + q = em.createQuery(HibernateIdentityObjectRelationshipName.findIdentityObjectRelationshipNamesForIdentityObjectOrdereByNameDesc); } } else { - q = em.createNamedQuery("findIdentityObjectRelationshipNamesForIdentityObject"); + q = em.createQuery(HibernateIdentityObjectRelationshipName.findIdentityObjectRelationshipNamesForIdentityObject); } q.setParameter("identityObject", hibernateObject); @@ -1218,7 +1253,7 @@ } } - List<String> results = (List<String>)q.getResultList(); + List<String> results = (List<String>)q.list(); names = new HashSet<String>(results); @@ -1685,7 +1720,7 @@ HibernateIdentityObject hibernateObject = safeGet(ctx, identityObject); - HibernateEntityManager em = getHibernateEntityManager(ctx); + Session em = getHibernateSession(ctx); if (supportedFeatures.isCredentialSupported(hibernateObject.getIdentityType(),credential.getType())) { @@ -1749,24 +1784,24 @@ public void addIdentityObjectType(IdentityStoreInvocationContext ctx, IdentityObjectType type) throws IdentityException { HibernateIdentityObjectType hibernateType = new HibernateIdentityObjectType(type); - getHibernateEntityManager(ctx).persist(hibernateType); + getHibernateSession(ctx).persist(hibernateType); } public void addIdentityObjectRelationshipType(IdentityStoreInvocationContext ctx, IdentityObjectRelationshipType type) throws IdentityException { HibernateIdentityObjectRelationshipType hibernateType = new HibernateIdentityObjectRelationshipType(type); - getHibernateEntityManager(ctx).persist(hibernateType); + getHibernateSession(ctx).persist(hibernateType); } - protected HibernateEntityManager getHibernateEntityManager(IdentityStoreInvocationContext ctx) throws IdentityException + protected Session getHibernateSession(IdentityStoreInvocationContext ctx) throws IdentityException { try { - return (HibernateEntityManager)ctx.getIdentityStoreSession().getSessionContext(); + return ((Session)ctx.getIdentityStoreSession().getSessionContext()); } - catch (IdentityException e) + catch (Exception e) { throw new IdentityException("Cannot obtain HibernateEntityManager", e); } @@ -1814,18 +1849,19 @@ HibernateIdentityObjectType hibernateType = null; - HibernateEntityManager em = getHibernateEntityManager(ctx); + Session em = getHibernateSession(ctx); try { - hibernateType = (HibernateIdentityObjectType)em.createNamedQuery("findIdentityObjectTypeByName") + hibernateType = (HibernateIdentityObjectType)em. + createQuery(HibernateIdentityObjectType.findIdentityObjectTypeByName) .setParameter("name", type.getName()) - .getSingleResult() ; + .uniqueResult() ; } - catch (NoResultException e) + catch (HibernateException e) { - throw new IdentityException("IdentityObjectType[" + type.getName() + "] not present in the store."); + throw new IdentityException("IdentityObjectType[" + type.getName() + "] not present in the store.", e); } return hibernateType; @@ -1836,16 +1872,16 @@ HibernateIdentityObject hibernateObject = null; - HibernateEntityManager em = getHibernateEntityManager(ctx); + Session em = getHibernateSession(ctx); try { - hibernateObject = (HibernateIdentityObject)em.createNamedQuery("findIdentityObjectByNameAndType") + hibernateObject = (HibernateIdentityObject)em.createQuery(HibernateIdentityObject.findIdentityObjectByNameAndType) .setParameter("name", io.getName()) .setParameter("typeName", io.getIdentityType().getName()) .setParameter("realm", getRealm(em, ctx)) - .getSingleResult(); + .uniqueResult(); } catch (Exception e) { @@ -1860,13 +1896,14 @@ HibernateIdentityObjectRelationshipType relationshipType = null; - HibernateEntityManager em = getHibernateEntityManager(ctx); + Session em = getHibernateSession(ctx); try { - relationshipType = (HibernateIdentityObjectRelationshipType)em.createNamedQuery("findIdentityObjectRelationshipTypeByName") + relationshipType = (HibernateIdentityObjectRelationshipType)em. + createQuery(HibernateIdentityObjectRelationshipType.findIdentityObjectRelationshipTypeByName) .setParameter("name", iot.getName()) - .getSingleResult(); + .uniqueResult(); } catch (Exception e) { @@ -1878,13 +1915,13 @@ private HibernateIdentityObjectCredentialType getHibernateIdentityObjectCredentialType(IdentityStoreInvocationContext ctx, IdentityObjectCredentialType credentialType) throws IdentityException { - HibernateEntityManager em = getHibernateEntityManager(ctx); + Session em = getHibernateSession(ctx); HibernateIdentityObjectCredentialType hibernateType = null; try { - hibernateType = (HibernateIdentityObjectCredentialType)em.getSession(). + hibernateType = (HibernateIdentityObjectCredentialType)em. createCriteria(HibernateIdentityObjectCredentialType.class).add(Restrictions.eq("name", credentialType.getName())).uniqueResult(); } catch (HibernateException e) @@ -1896,87 +1933,87 @@ } - public void populateObjectTypes(HibernateEntityManager em, String[] typeNames) throws Exception + public void populateObjectTypes(Session hibernateSession, String[] typeNames) throws Exception { - em.getTransaction().begin(); + hibernateSession.getTransaction().begin(); for (String typeName : typeNames) { //Check if present - HibernateIdentityObjectType hibernateType = (HibernateIdentityObjectType)em.getSession(). + HibernateIdentityObjectType hibernateType = (HibernateIdentityObjectType)hibernateSession. createCriteria(HibernateIdentityObjectType.class).add(Restrictions.eq("name", typeName)).uniqueResult(); if (hibernateType == null) { hibernateType = new HibernateIdentityObjectType(typeName); - em.persist(hibernateType); + hibernateSession.persist(hibernateType); } } - em.getTransaction().commit(); + hibernateSession.getTransaction().commit(); } - public void populateRelationshipTypes(HibernateEntityManager em, String[] typeNames) throws Exception + public void populateRelationshipTypes(Session hibernateSession, String[] typeNames) throws Exception { - em.getTransaction().begin(); + hibernateSession.getTransaction().begin(); for (String typeName : typeNames) { - HibernateIdentityObjectRelationshipType hibernateType = (HibernateIdentityObjectRelationshipType)em.getSession(). + HibernateIdentityObjectRelationshipType hibernateType = (HibernateIdentityObjectRelationshipType)hibernateSession. createCriteria(HibernateIdentityObjectRelationshipType.class).add(Restrictions.eq("name", typeName)).uniqueResult(); if (hibernateType == null) { hibernateType = new HibernateIdentityObjectRelationshipType(typeName); - em.persist(hibernateType); + hibernateSession.persist(hibernateType); } } - em.getTransaction().commit(); + hibernateSession.getTransaction().commit(); } - public void populateCredentialTypes(HibernateEntityManager em, String[] typeNames) throws Exception + public void populateCredentialTypes(Session hibernateSession, String[] typeNames) throws Exception { - em.getTransaction().begin(); + hibernateSession.getTransaction().begin(); for (String typeName : typeNames) { - HibernateIdentityObjectCredentialType hibernateType = (HibernateIdentityObjectCredentialType)em.getSession(). + HibernateIdentityObjectCredentialType hibernateType = (HibernateIdentityObjectCredentialType)hibernateSession. createCriteria(HibernateIdentityObjectCredentialType.class).add(Restrictions.eq("name", typeName)).uniqueResult(); if (hibernateType == null) { hibernateType = new HibernateIdentityObjectCredentialType(typeName); - em.persist(hibernateType); + hibernateSession.persist(hibernateType); } } - em.getTransaction().commit(); + hibernateSession.getTransaction().commit(); } - public void addRealm(HibernateEntityManager em, String realmName) throws IdentityException + public void addRealm(Session hibernateSession, String realmName) throws IdentityException { try { - em.getTransaction().begin(); + hibernateSession.getTransaction().begin(); HibernateRealm realm = new HibernateRealm(realmName); - em.persist(realm); + hibernateSession.persist(realm); - em.getTransaction().commit(); + hibernateSession.getTransaction().commit(); } catch (Exception e) @@ -1986,7 +2023,7 @@ } - public HibernateRealm getRealm(HibernateEntityManager em, IdentityStoreInvocationContext ctx) throws IdentityException + public HibernateRealm getRealm(Session hibernateSession, IdentityStoreInvocationContext ctx) throws IdentityException { if (ctx.getRealmId() == null) { @@ -1998,7 +2035,7 @@ // If store is not realm aware return null to create/get objects accessible from other realms if (!isRealmAware()) { - realm = (HibernateRealm)em.getSession(). + realm = (HibernateRealm)hibernateSession. createCriteria(HibernateRealm.class).add(Restrictions.eq("name", DEFAULT_REALM_NAME)).uniqueResult(); if (realm == null) @@ -2009,7 +2046,7 @@ } else { - realm = (HibernateRealm)em.getSession(). + realm = (HibernateRealm)hibernateSession. createCriteria(HibernateRealm.class).add(Restrictions.eq("name", ctx.getRealmId())).uniqueResult(); @@ -2017,7 +2054,7 @@ if (realm == null) { HibernateRealm newRealm = new HibernateRealm(ctx.getRealmId()); - em.persist(newRealm); + hibernateSession.persist(newRealm); return newRealm; } } Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreSessionImpl.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreSessionImpl.java 2009-02-03 10:32:25 UTC (rev 298) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreSessionImpl.java 2009-02-03 12:54:58 UTC (rev 299) @@ -24,8 +24,8 @@ import org.jboss.identity.idm.spi.store.IdentityStoreSession; import org.jboss.identity.idm.exception.IdentityException; +import org.hibernate.Session; import org.hibernate.ejb.HibernateEntityManagerFactory; -import org.hibernate.ejb.HibernateEntityManager; import javax.persistence.Persistence; @@ -38,42 +38,42 @@ public class HibernateIdentityStoreSessionImpl implements IdentityStoreSession { - private final HibernateEntityManager hem; + private final Session hibernateSession; - public HibernateIdentityStoreSessionImpl(HibernateEntityManager hem) + public HibernateIdentityStoreSessionImpl(Session hibernateSession) { - this.hem = hem; + this.hibernateSession = hibernateSession; } public HibernateIdentityStoreSessionImpl(String persistenceUnit) { HibernateEntityManagerFactory emFactory = (HibernateEntityManagerFactory)Persistence.createEntityManagerFactory(persistenceUnit); - hem = (HibernateEntityManager)emFactory.createEntityManager(); + hibernateSession = emFactory.getSessionFactory().openSession(); } public Object getSessionContext() { - return hem; + return hibernateSession; } public void close() throws IdentityException { - hem.close(); + hibernateSession.close(); } public void save() throws IdentityException { - hem.flush(); + hibernateSession.flush(); } public void clear() throws IdentityException { - hem.clear(); + hibernateSession.clear(); } public boolean isOpen() { - return hem.isOpen(); + return hibernateSession.isOpen(); } public boolean isTransactionSupported() @@ -83,21 +83,21 @@ public void startTransaction() { - hem.getTransaction().begin(); + hibernateSession.getTransaction().begin(); } public void commitTransaction() { - hem.getTransaction().commit(); + hibernateSession.getTransaction().commit(); } public void rollbackTransaction() { - hem.getTransaction().rollback(); + hibernateSession.getTransaction().rollback(); } public boolean isTransactionActive() { - return hem.getTransaction().isActive(); + return hibernateSession.getTransaction().isActive(); } } Modified: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreTestCase.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreTestCase.java 2009-02-03 10:32:25 UTC (rev 298) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreTestCase.java 2009-02-03 12:54:58 UTC (rev 299) @@ -39,6 +39,8 @@ import org.jboss.identity.idm.exception.IdentityException; import org.hibernate.ejb.HibernateEntityManager; import org.hibernate.ejb.HibernateEntityManagerFactory; +import org.hibernate.Session; +import org.hibernate.SessionFactory; import java.util.Map; import java.io.File; @@ -86,15 +88,15 @@ store = new HibernateIdentityStoreImpl("HibernateTestStore") { - protected HibernateEntityManager getHibernateEntityManager(IdentityStoreInvocationContext ctx) + protected Session getHibernateSession(IdentityStoreInvocationContext ctx) { - return em; + return em.getSession(); } @Override - protected HibernateEntityManagerFactory bootstrapHibernateEntityManager(IdentityStoreConfigurationMetaData configurationMD) throws IdentityException + protected SessionFactory bootstrapHibernateSessionFactory(IdentityStoreConfigurationMetaData configurationMD) throws IdentityException { - return emFactory; + return emFactory.getSessionFactory(); } };

15 years, 3 months

1
0
0 / 0

JBoss Identity SVN: r298 - in idm/trunk/idm/src: test/java/org/jboss/identity/idm/impl and 1 other directories.

by jboss-identity-commits＠lists.jboss.org

Author: bdaw Date: 2009-02-03 05:32:25 -0500 (Tue, 03 Feb 2009) New Revision: 298 Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/HibernateTestSupport.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreTestCase.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateTestBase.java Log: - improve how HibernateEntityManagerFactory is constructetd in Hibernate store Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-02-02 22:36:02 UTC (rev 297) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-02-03 10:32:25 UTC (rev 298) @@ -171,13 +171,14 @@ supportedFeatures = new FeaturesMetaDataImpl(configurationMD, supportedIdentityObjectSearchControls, true, new HashSet<String>()); - String persistenceUnit = configurationMD.getOptionSingleValue(PERSISTENCE_UNIT); String populateMembershipTypes = configurationMD.getOptionSingleValue(POPULATE_MEMBERSHIP_TYPES); String populateIdentityObjectTypes = configurationMD.getOptionSingleValue(POPULATE_IDENTITY_OBJECT_TYPES); - HibernateEntityManager em = bootstrapHibernateEntityManager(persistenceUnit); + emFactory = bootstrapHibernateEntityManager(configurationMD); + HibernateEntityManager em = (HibernateEntityManager)emFactory.createEntityManager(); + // Attribute mappings - helper structures for (IdentityObjectTypeMetaData identityObjectTypeMetaData : configurationMD.getSupportedIdentityTypes()) @@ -300,17 +301,18 @@ } // this is separate method to allow easier testing - protected HibernateEntityManager bootstrapHibernateEntityManager(String persistenceUnit) throws IdentityException + protected HibernateEntityManagerFactory bootstrapHibernateEntityManager(IdentityStoreConfigurationMetaData configurationMD) throws IdentityException { + + String persistenceUnit = configurationMD.getOptionSingleValue(PERSISTENCE_UNIT); + if (persistenceUnit == null) { throw new IdentityException("Persistence Unit not defined for IdentityStore: " + getId()); } - emFactory = (HibernateEntityManagerFactory)Persistence.createEntityManagerFactory(persistenceUnit); + return (HibernateEntityManagerFactory)Persistence.createEntityManagerFactory(persistenceUnit); - return (HibernateEntityManager)emFactory.createEntityManager(); - } Modified: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/HibernateTestSupport.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/HibernateTestSupport.java 2009-02-02 22:36:02 UTC (rev 297) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/HibernateTestSupport.java 2009-02-03 10:32:25 UTC (rev 298) @@ -61,7 +61,12 @@ return em; } + public HibernateEntityManagerFactory getHibernateEntityManagerFactory() + { + return emFactory; + } + public void start() throws Exception { try { logger.info("Starting in-memory HSQL database for unit tests"); Modified: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreTestCase.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreTestCase.java 2009-02-02 22:36:02 UTC (rev 297) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreTestCase.java 2009-02-03 10:32:25 UTC (rev 298) @@ -38,6 +38,7 @@ import org.jboss.identity.idm.impl.api.SimpleAttribute; import org.jboss.identity.idm.exception.IdentityException; import org.hibernate.ejb.HibernateEntityManager; +import org.hibernate.ejb.HibernateEntityManagerFactory; import java.util.Map; import java.io.File; @@ -91,9 +92,9 @@ } @Override - protected HibernateEntityManager bootstrapHibernateEntityManager(String persistenceUnit) throws IdentityException + protected HibernateEntityManagerFactory bootstrapHibernateEntityManager(IdentityStoreConfigurationMetaData configurationMD) throws IdentityException { - return em; + return emFactory; } }; Modified: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateTestBase.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateTestBase.java 2009-02-02 22:36:02 UTC (rev 297) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateTestBase.java 2009-02-03 10:32:25 UTC (rev 298) @@ -27,6 +27,7 @@ import java.util.logging.Logger; import org.hibernate.ejb.HibernateEntityManager; +import org.hibernate.ejb.HibernateEntityManagerFactory; import org.jboss.identity.idm.impl.store.hibernate.HibernateModelTestCase; import org.jboss.identity.idm.impl.HibernateTestSupport; @@ -42,7 +43,11 @@ protected HibernateEntityManager em; + protected HibernateEntityManagerFactory emFactory; + + + public HibernateTestBase(String testName) { super(testName); } @@ -51,6 +56,7 @@ protected void setUp() throws Exception { super.setUp(); hibernateSupport.start(); + emFactory = hibernateSupport.getHibernateEntityManagerFactory(); em = hibernateSupport.getHibernateEntityManager(); }

15 years, 3 months

1
0
0 / 0

JBoss Identity SVN: r297 - in xmlkey/trunk: assembly and 4 other directories.

by jboss-identity-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2009-02-02 17:36:02 -0500 (Mon, 02 Feb 2009) New Revision: 297 Modified: xmlkey/trunk/assembly/pom.xml xmlkey/trunk/common/pom.xml xmlkey/trunk/parent/pom.xml xmlkey/trunk/pom.xml xmlkey/trunk/skms/pom.xml xmlkey/trunk/xkms/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: xmlkey/trunk/assembly/pom.xml =================================================================== --- xmlkey/trunk/assembly/pom.xml 2009-02-02 22:35:56 UTC (rev 296) +++ xmlkey/trunk/assembly/pom.xml 2009-02-02 22:36:02 UTC (rev 297) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.identity</groupId> <artifactId>jboss-xmlkey-parent</artifactId> - <version>1.0.0.alpha1</version> + <version>1.0.0.alpha1-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: xmlkey/trunk/common/pom.xml =================================================================== --- xmlkey/trunk/common/pom.xml 2009-02-02 22:35:56 UTC (rev 296) +++ xmlkey/trunk/common/pom.xml 2009-02-02 22:36:02 UTC (rev 297) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.identity</groupId> <artifactId>jboss-xmlkey-parent</artifactId> - <version>1.0.0.alpha1</version> + <version>1.0.0.alpha1-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -22,9 +22,9 @@ <url>http://www.jboss.org</url> </organization> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/repos/jbossidentity/xmlkey/tags/1....</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossidentity/xmlkey/tags/1.0.0.alpha1</developerConnection> - <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/repos/jbossidentity/xmlkey/tag...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/xmlkey/trunk</connection> + <developerConnection>scm:svn:https://svn.jboss.org/jbossidentity/xmlkey/trunk</developerConnection> + <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossidentity/xmlkey/trunk</url> </scm> <build> <plugins> Modified: xmlkey/trunk/parent/pom.xml =================================================================== --- xmlkey/trunk/parent/pom.xml 2009-02-02 22:35:56 UTC (rev 296) +++ xmlkey/trunk/parent/pom.xml 2009-02-02 22:36:02 UTC (rev 297) @@ -8,7 +8,7 @@ <groupId>org.jboss.identity</groupId> <artifactId>jboss-xmlkey-parent</artifactId> <packaging>pom</packaging> - <version>1.0.0.alpha1</version> + <version>1.0.0.alpha1-SNAPSHOT</version> <name>JBoss XMLKey Federation- Parent</name> <url>http://labs.jboss.org/portal/jbosssecurity/</url> <description>JBoss XMLKey is an implementation of XML Based Key Management</description> @@ -23,8 +23,8 @@ <url>http://www.jboss.org</url> </organization> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/xmlkey/tags/1.0.0.al...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossidentity/xmlkey/tags/1.0.0.alpha1</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/xmlkey/trunk</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossidentity/xmlkey/trunk</developerConnection> </scm> <build> Modified: xmlkey/trunk/pom.xml =================================================================== --- xmlkey/trunk/pom.xml 2009-02-02 22:35:56 UTC (rev 296) +++ xmlkey/trunk/pom.xml 2009-02-02 22:36:02 UTC (rev 297) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.identity</groupId> <artifactId>jboss-xmlkey-parent</artifactId> - <version>1.0.0.alpha1</version> + <version>1.0.0.alpha1-SNAPSHOT</version> <relativePath>parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: xmlkey/trunk/skms/pom.xml =================================================================== --- xmlkey/trunk/skms/pom.xml 2009-02-02 22:35:56 UTC (rev 296) +++ xmlkey/trunk/skms/pom.xml 2009-02-02 22:36:02 UTC (rev 297) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.identity</groupId> <artifactId>jboss-xmlkey-parent</artifactId> - <version>1.0.0.alpha1</version> + <version>1.0.0.alpha1-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -22,9 +22,9 @@ <url>http://www.jboss.org</url> </organization> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/repos/jbossidentity/xmlkey/tags/1....</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossidentity/xmlkey/tags/1.0.0.alpha1</developerConnection> - <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/repos/jbossidentity/xmlkey/tag...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/xmlkey/trunk</connection> + <developerConnection>scm:svn:https://svn.jboss.org/jbossidentity/xmlkey/trunk</developerConnection> + <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossidentity/xmlkey/trunk</url> </scm> <build> <plugins> Modified: xmlkey/trunk/xkms/pom.xml =================================================================== --- xmlkey/trunk/xkms/pom.xml 2009-02-02 22:35:56 UTC (rev 296) +++ xmlkey/trunk/xkms/pom.xml 2009-02-02 22:36:02 UTC (rev 297) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.identity</groupId> <artifactId>jboss-xmlkey-parent</artifactId> - <version>1.0.0.alpha1</version> + <version>1.0.0.alpha1-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -22,9 +22,9 @@ <url>http://www.jboss.org</url> </organization> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/repos/jbossidentity/xmlkey/tags/1....</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossidentity/xmlkey/tags/1.0.0.alpha1</developerConnection> - <url>scm:svn:https://svn.jboss.org/repos/jbossidentity/xmlkey/tags/1.0.0.alpha1</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/xmlkey/trunk</connection> + <developerConnection>scm:svn:https://svn.jboss.org/jbossidentity/xmlkey/trunk</developerConnection> + <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossidentity/xkms/trunk</url> </scm> <build> <plugins>

15 years, 3 months

1
0
0 / 0

JBoss Identity SVN: r296 - in xmlkey/tags: 1.0.0.alpha1 and 5 other directories.

by jboss-identity-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2009-02-02 17:35:56 -0500 (Mon, 02 Feb 2009) New Revision: 296 Added: xmlkey/tags/1.0.0.alpha1/ xmlkey/tags/1.0.0.alpha1/assembly/ xmlkey/tags/1.0.0.alpha1/assembly/pom.xml xmlkey/tags/1.0.0.alpha1/common/ xmlkey/tags/1.0.0.alpha1/common/pom.xml xmlkey/tags/1.0.0.alpha1/parent/ xmlkey/tags/1.0.0.alpha1/parent/pom.xml xmlkey/tags/1.0.0.alpha1/pom.xml xmlkey/tags/1.0.0.alpha1/skms/ xmlkey/tags/1.0.0.alpha1/skms/pom.xml xmlkey/tags/1.0.0.alpha1/xkms/ xmlkey/tags/1.0.0.alpha1/xkms/pom.xml Removed: xmlkey/tags/1.0.0.alpha1/assembly/ xmlkey/tags/1.0.0.alpha1/assembly/pom.xml xmlkey/tags/1.0.0.alpha1/common/ xmlkey/tags/1.0.0.alpha1/common/pom.xml xmlkey/tags/1.0.0.alpha1/parent/ xmlkey/tags/1.0.0.alpha1/parent/pom.xml xmlkey/tags/1.0.0.alpha1/pom.xml xmlkey/tags/1.0.0.alpha1/skms/ xmlkey/tags/1.0.0.alpha1/skms/pom.xml xmlkey/tags/1.0.0.alpha1/xkms/ xmlkey/tags/1.0.0.alpha1/xkms/pom.xml Log: [maven-release-plugin] copy for tag 1.0.0.alpha1 Copied: xmlkey/tags/1.0.0.alpha1 (from rev 293, xmlkey/trunk) Copied: xmlkey/tags/1.0.0.alpha1/assembly (from rev 292, xmlkey/trunk/assembly) Deleted: xmlkey/tags/1.0.0.alpha1/assembly/pom.xml =================================================================== --- xmlkey/trunk/assembly/pom.xml 2009-02-02 22:29:40 UTC (rev 292) +++ xmlkey/tags/1.0.0.alpha1/assembly/pom.xml 2009-02-02 22:35:56 UTC (rev 296) @@ -1,63 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>org.jboss.identity</groupId> - <artifactId>jboss-xmlkey-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> - <relativePath>../parent</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.identity</groupId> - <artifactId>jboss-xmlkey</artifactId> - <packaging>pom</packaging> - <name>JBoss XMLKey- Assembly</name> - <url>http://labs.jboss.org/portal/jbosssecurity/</url> - <description>JBoss XMLKey</description> - <licenses> - <license> - <name>lgpl</name> - <url>http://repository.jboss.com/licenses/lgpl.txt</url> - </license> - </licenses> - <organization> - <name>JBoss Inc.</name> - <url>http://www.jboss.org</url> - </organization> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.1</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>attached</goal> - </goals> - </execution> - </executions> - <configuration> - <archive> - <manifestEntries> - <Specification-Title>JBoss Identity</Specification-Title> - <Specification-Version>${project.version}</Specification-Version> - <Specification-Vendor>Red Hat Middleware LLC</Specification-Vendor> - <Implementation-Title>JBoss Identity</Implementation-Title> - <Implementation-Version>${project.version}</Implementation-Version> - <Implementation-VendorId>org.jboss.security</Implementation-VendorId> - <Implementation-Vendor>Red Hat Middleware LLC</Implementation-Vendor> - <Implementation-URL>http://labs.jboss.org/portal/jbosssecurity/</Implementation-URL> - </manifestEntries> - </archive> - <descriptors> - <descriptor>bin.xml</descriptor> - <descriptor>sources.xml</descriptor> - </descriptors> - </configuration> - <inherited>false</inherited> - </plugin> - </plugins> - </build> - -</project> Copied: xmlkey/tags/1.0.0.alpha1/assembly/pom.xml (from rev 295, xmlkey/trunk/assembly/pom.xml) =================================================================== --- xmlkey/tags/1.0.0.alpha1/assembly/pom.xml (rev 0) +++ xmlkey/tags/1.0.0.alpha1/assembly/pom.xml 2009-02-02 22:35:56 UTC (rev 296) @@ -0,0 +1,63 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.jboss.identity</groupId> + <artifactId>jboss-xmlkey-parent</artifactId> + <version>1.0.0.alpha1</version> + <relativePath>../parent</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.identity</groupId> + <artifactId>jboss-xmlkey</artifactId> + <packaging>pom</packaging> + <name>JBoss XMLKey- Assembly</name> + <url>http://labs.jboss.org/portal/jbosssecurity/</url> + <description>JBoss XMLKey</description> + <licenses> + <license> + <name>lgpl</name> + <url>http://repository.jboss.com/licenses/lgpl.txt</url> + </license> + </licenses> + <organization> + <name>JBoss Inc.</name> + <url>http://www.jboss.org</url> + </organization> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.1</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>attached</goal> + </goals> + </execution> + </executions> + <configuration> + <archive> + <manifestEntries> + <Specification-Title>JBoss Identity</Specification-Title> + <Specification-Version>${project.version}</Specification-Version> + <Specification-Vendor>Red Hat Middleware LLC</Specification-Vendor> + <Implementation-Title>JBoss Identity</Implementation-Title> + <Implementation-Version>${project.version}</Implementation-Version> + <Implementation-VendorId>org.jboss.security</Implementation-VendorId> + <Implementation-Vendor>Red Hat Middleware LLC</Implementation-Vendor> + <Implementation-URL>http://labs.jboss.org/portal/jbosssecurity/</Implementation-URL> + </manifestEntries> + </archive> + <descriptors> + <descriptor>bin.xml</descriptor> + <descriptor>sources.xml</descriptor> + </descriptors> + </configuration> + <inherited>false</inherited> + </plugin> + </plugins> + </build> + +</project> Copied: xmlkey/tags/1.0.0.alpha1/common (from rev 292, xmlkey/trunk/common) Deleted: xmlkey/tags/1.0.0.alpha1/common/pom.xml =================================================================== --- xmlkey/trunk/common/pom.xml 2009-02-02 22:29:40 UTC (rev 292) +++ xmlkey/tags/1.0.0.alpha1/common/pom.xml 2009-02-02 22:35:56 UTC (rev 296) @@ -1,116 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>org.jboss.identity</groupId> - <artifactId>jboss-xmlkey-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> - <relativePath>../parent</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>jboss-xmlkey-common</artifactId> - <packaging>jar</packaging> - <name>JBoss xmlkey-common </name> - <url>http://labs.jboss.org/portal/jbosssecurity/</url> - <description>JBoss XKMS.</description> - <licenses> - <license> - <name>lgpl</name> - <url>http://repository.jboss.com/licenses/lgpl.txt</url> - </license> - </licenses> - <organization> - <name>JBoss Inc.</name> - <url>http://www.jboss.org</url> - </organization> - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/xmlkey/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/jbossidentity/xmlkey/trunk</developerConnection> - <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossidentity/xmlkey/trunk</url> - </scm> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.3</version> - <configuration> - <printSummary>true</printSummary> - <disableXmlReport>false</disableXmlReport> - <testFailureIgnore>false</testFailureIgnore> - <includes> - <include>**/**TestCase.java</include> - </includes> - <forkMode>pertest</forkMode> - <argLine>-Djava.endorsed.dirs=${basedir}/src/test/resources/endorsed</argLine> - <useFile>false</useFile> - <trimStackTrace>false</trimStackTrace> - </configuration> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>apache-log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - <dependency> - <groupId>apache-xmlsec</groupId> - <artifactId>xmlsec</artifactId> - </dependency> - <dependency> - <groupId>sun-jaxb</groupId> - <artifactId>jaxb-api</artifactId> - </dependency> - <dependency> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>sun-jaf</groupId> - <artifactId>activation</artifactId> - <version>1.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>codehaus-stax</groupId> - <artifactId>stax</artifactId> - <version>1.1.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <doclet>org.jboss.apiviz.APIviz</doclet> - <docletArtifact> - <groupId>org.jboss.apiviz</groupId> - <artifactId>apiviz</artifactId> - <version>1.2.5.GA</version> - </docletArtifact> - <additionalparam> - -charset UTF-8 - -docencoding UTF-8 - -version - -author - -breakiterator - -windowtitle "${project.name} ${project.version} API Reference" - -doctitle "${project.name} ${project.version} API Reference" - -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved." - -link http://java.sun.com/javase/6/docs/api/ - -sourceclasspath ${project.build.outputDirectory} - </additionalparam> - <encoding>UTF-8</encoding> - </configuration> - </plugin> - </plugins> - </reporting> -</project> Copied: xmlkey/tags/1.0.0.alpha1/common/pom.xml (from rev 295, xmlkey/trunk/common/pom.xml) =================================================================== --- xmlkey/tags/1.0.0.alpha1/common/pom.xml (rev 0) +++ xmlkey/tags/1.0.0.alpha1/common/pom.xml 2009-02-02 22:35:56 UTC (rev 296) @@ -0,0 +1,116 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.jboss.identity</groupId> + <artifactId>jboss-xmlkey-parent</artifactId> + <version>1.0.0.alpha1</version> + <relativePath>../parent</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>jboss-xmlkey-common</artifactId> + <packaging>jar</packaging> + <name>JBoss xmlkey-common </name> + <url>http://labs.jboss.org/portal/jbosssecurity/</url> + <description>JBoss XKMS.</description> + <licenses> + <license> + <name>lgpl</name> + <url>http://repository.jboss.com/licenses/lgpl.txt</url> + </license> + </licenses> + <organization> + <name>JBoss Inc.</name> + <url>http://www.jboss.org</url> + </organization> + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/repos/jbossidentity/xmlkey/tags/1....</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossidentity/xmlkey/tags/1.0.0.alpha1</developerConnection> + <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/repos/jbossidentity/xmlkey/tag...</url> + </scm> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.4.3</version> + <configuration> + <printSummary>true</printSummary> + <disableXmlReport>false</disableXmlReport> + <testFailureIgnore>false</testFailureIgnore> + <includes> + <include>**/**TestCase.java</include> + </includes> + <forkMode>pertest</forkMode> + <argLine>-Djava.endorsed.dirs=${basedir}/src/test/resources/endorsed</argLine> + <useFile>false</useFile> + <trimStackTrace>false</trimStackTrace> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + <dependency> + <groupId>apache-xmlsec</groupId> + <artifactId>xmlsec</artifactId> + </dependency> + <dependency> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-api</artifactId> + </dependency> + <dependency> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>sun-jaf</groupId> + <artifactId>activation</artifactId> + <version>1.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>codehaus-stax</groupId> + <artifactId>stax</artifactId> + <version>1.1.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <doclet>org.jboss.apiviz.APIviz</doclet> + <docletArtifact> + <groupId>org.jboss.apiviz</groupId> + <artifactId>apiviz</artifactId> + <version>1.2.5.GA</version> + </docletArtifact> + <additionalparam> + -charset UTF-8 + -docencoding UTF-8 + -version + -author + -breakiterator + -windowtitle "${project.name} ${project.version} API Reference" + -doctitle "${project.name} ${project.version} API Reference" + -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved." + -link http://java.sun.com/javase/6/docs/api/ + -sourceclasspath ${project.build.outputDirectory} + </additionalparam> + <encoding>UTF-8</encoding> + </configuration> + </plugin> + </plugins> + </reporting> +</project> \ No newline at end of file Copied: xmlkey/tags/1.0.0.alpha1/parent (from rev 292, xmlkey/trunk/parent) Deleted: xmlkey/tags/1.0.0.alpha1/parent/pom.xml =================================================================== --- xmlkey/trunk/parent/pom.xml 2009-02-02 22:29:40 UTC (rev 292) +++ xmlkey/tags/1.0.0.alpha1/parent/pom.xml 2009-02-02 22:35:56 UTC (rev 296) @@ -1,115 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>org.jboss</groupId> - <artifactId>jboss-parent</artifactId> - <version>4</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.identity</groupId> - <artifactId>jboss-xmlkey-parent</artifactId> - <packaging>pom</packaging> - <version>1.0.0-SNAPSHOT</version> - <name>JBoss XMLKey Federation- Parent</name> - <url>http://labs.jboss.org/portal/jbosssecurity/</url> - <description>JBoss XMLKey is an implementation of XML Based Key Management</description> - <licenses> - <license> - <name>lgpl</name> - <url>http://repository.jboss.com/licenses/lgpl.txt</url> - </license> - </licenses> - <organization> - <name>JBoss Inc.</name> - <url>http://www.jboss.org</url> - </organization> - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/xmlkey/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossidentity/xmlkey/trunk</developerConnection> - </scm> - - <build> - <plugins> - <plugin> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <tagBase>https://svn.jboss.org/repos/jbossidentity/xmlkey/tags</tagBase> - </configuration> - </plugin> - </plugins> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <printSummary>true</printSummary> - <disableXmlReport>false</disableXmlReport> - <testFailureIgnore>true</testFailureIgnore> - <includes> - <include>**/**TestCase.java</include> - </includes> - <forkMode>pertest</forkMode> - <argLine>${surefire.jvm.args}</argLine> - <useFile>false</useFile> - <trimStackTrace>false</trimStackTrace> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - - <repositories> - <repository> - <id>repository.jboss.org</id> - <name>JBoss Repository</name> - <layout>default</layout> - <url>http://repository.jboss.org/maven2/</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - - <repository> - <id>snapshots.jboss.org</id> - <name>JBoss Snapshots Repository</name> - <layout>default</layout> - <url>http://snapshots.jboss.org/maven2/</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </repository> - </repositories> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.4</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>apache-log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> - <dependency> - <groupId>sun-jaxb</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.1.9</version> - </dependency> - <dependency> - <groupId>sun-jaxb</groupId> - <artifactId>jaxb-impl</artifactId> - <version>2.1.9</version> - </dependency> - <dependency> - <groupId>apache-xmlsec</groupId> - <artifactId>xmlsec</artifactId> - <version>1.3.0</version> - </dependency> - </dependencies> - </dependencyManagement> -</project> Copied: xmlkey/tags/1.0.0.alpha1/parent/pom.xml (from rev 295, xmlkey/trunk/parent/pom.xml) =================================================================== --- xmlkey/tags/1.0.0.alpha1/parent/pom.xml (rev 0) +++ xmlkey/tags/1.0.0.alpha1/parent/pom.xml 2009-02-02 22:35:56 UTC (rev 296) @@ -0,0 +1,115 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.jboss</groupId> + <artifactId>jboss-parent</artifactId> + <version>4</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.identity</groupId> + <artifactId>jboss-xmlkey-parent</artifactId> + <packaging>pom</packaging> + <version>1.0.0.alpha1</version> + <name>JBoss XMLKey Federation- Parent</name> + <url>http://labs.jboss.org/portal/jbosssecurity/</url> + <description>JBoss XMLKey is an implementation of XML Based Key Management</description> + <licenses> + <license> + <name>lgpl</name> + <url>http://repository.jboss.com/licenses/lgpl.txt</url> + </license> + </licenses> + <organization> + <name>JBoss Inc.</name> + <url>http://www.jboss.org</url> + </organization> + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/xmlkey/tags/1.0.0.al...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossidentity/xmlkey/tags/1.0.0.alpha1</developerConnection> + </scm> + + <build> + <plugins> + <plugin> + <artifactId>maven-release-plugin</artifactId> + <configuration> + <tagBase>https://svn.jboss.org/repos/jbossidentity/xmlkey/tags</tagBase> + </configuration> + </plugin> + </plugins> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <printSummary>true</printSummary> + <disableXmlReport>false</disableXmlReport> + <testFailureIgnore>true</testFailureIgnore> + <includes> + <include>**/**TestCase.java</include> + </includes> + <forkMode>pertest</forkMode> + <argLine>${surefire.jvm.args}</argLine> + <useFile>false</useFile> + <trimStackTrace>false</trimStackTrace> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + + <repositories> + <repository> + <id>repository.jboss.org</id> + <name>JBoss Repository</name> + <layout>default</layout> + <url>http://repository.jboss.org/maven2/</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + + <repository> + <id>snapshots.jboss.org</id> + <name>JBoss Snapshots Repository</name> + <layout>default</layout> + <url>http://snapshots.jboss.org/maven2/</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </repository> + </repositories> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> + <dependency> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.1.9</version> + </dependency> + <dependency> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-impl</artifactId> + <version>2.1.9</version> + </dependency> + <dependency> + <groupId>apache-xmlsec</groupId> + <artifactId>xmlsec</artifactId> + <version>1.3.0</version> + </dependency> + </dependencies> + </dependencyManagement> +</project> Deleted: xmlkey/tags/1.0.0.alpha1/pom.xml =================================================================== --- xmlkey/trunk/pom.xml 2009-02-02 22:30:11 UTC (rev 293) +++ xmlkey/tags/1.0.0.alpha1/pom.xml 2009-02-02 22:35:56 UTC (rev 296) @@ -1,23 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>org.jboss.identity</groupId> - <artifactId>jboss-xmlkey-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> - <relativePath>parent</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.identity</groupId> - <artifactId>jboss-xmlkey-pom</artifactId> - <packaging>pom</packaging> - <name>JBoss XMLKey- Aggregator</name> - <url>http://labs.jboss.org/portal/jbosssecurity/</url> - <description>JBoss XMLKey is a project for XML Based Key Management</description> - - <modules> - <module>parent</module> - <module>common</module> - <module>xkms</module> - <module>skms</module> - <module>assembly</module> - </modules> -</project> Copied: xmlkey/tags/1.0.0.alpha1/pom.xml (from rev 295, xmlkey/trunk/pom.xml) =================================================================== --- xmlkey/tags/1.0.0.alpha1/pom.xml (rev 0) +++ xmlkey/tags/1.0.0.alpha1/pom.xml 2009-02-02 22:35:56 UTC (rev 296) @@ -0,0 +1,23 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.jboss.identity</groupId> + <artifactId>jboss-xmlkey-parent</artifactId> + <version>1.0.0.alpha1</version> + <relativePath>parent</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.identity</groupId> + <artifactId>jboss-xmlkey-pom</artifactId> + <packaging>pom</packaging> + <name>JBoss XMLKey- Aggregator</name> + <url>http://labs.jboss.org/portal/jbosssecurity/</url> + <description>JBoss XMLKey is a project for XML Based Key Management</description> + + <modules> + <module>parent</module> + <module>common</module> + <module>xkms</module> + <module>skms</module> + <module>assembly</module> + </modules> +</project> Copied: xmlkey/tags/1.0.0.alpha1/skms (from rev 292, xmlkey/trunk/skms) Deleted: xmlkey/tags/1.0.0.alpha1/skms/pom.xml =================================================================== --- xmlkey/trunk/skms/pom.xml 2009-02-02 22:29:40 UTC (rev 292) +++ xmlkey/tags/1.0.0.alpha1/skms/pom.xml 2009-02-02 22:35:56 UTC (rev 296) @@ -1,125 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>org.jboss.identity</groupId> - <artifactId>jboss-xmlkey-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> - <relativePath>../parent</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>jboss-skms</artifactId> - <packaging>jar</packaging> - <name>JBoss skms </name> - <url>http://labs.jboss.org/portal/jbosssecurity/</url> - <description>JBoss SKMS.</description> - <licenses> - <license> - <name>lgpl</name> - <url>http://repository.jboss.com/licenses/lgpl.txt</url> - </license> - </licenses> - <organization> - <name>JBoss Inc.</name> - <url>http://www.jboss.org</url> - </organization> - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/xmlkey/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/jbossidentity/xmlkey/trunk</developerConnection> - <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossidentity/xmlkey/trunk</url> - </scm> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.3</version> - <configuration> - <printSummary>true</printSummary> - <disableXmlReport>false</disableXmlReport> - <testFailureIgnore>false</testFailureIgnore> - <includes> - <include>**/**TestCase.java</include> - </includes> - <forkMode>pertest</forkMode> - <argLine>-Djava.endorsed.dirs=${basedir}/src/test/resources/endorsed</argLine> - <useFile>false</useFile> - <trimStackTrace>false</trimStackTrace> - </configuration> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>org.jboss.identity</groupId> - <artifactId>jboss-identity-xmlsec-model</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>apache-log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - <dependency> - <groupId>apache-xmlsec</groupId> - <artifactId>xmlsec</artifactId> - </dependency> - <dependency> - <groupId>sun-jaxb</groupId> - <artifactId>jaxb-api</artifactId> - </dependency> - <dependency> - <groupId>sun-jaxb</groupId> - <artifactId>jaxb-impl</artifactId> - </dependency> - <dependency> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>sun-jaf</groupId> - <artifactId>activation</artifactId> - <version>1.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>codehaus-stax</groupId> - <artifactId>stax</artifactId> - <version>1.1.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <doclet>org.jboss.apiviz.APIviz</doclet> - <docletArtifact> - <groupId>org.jboss.apiviz</groupId> - <artifactId>apiviz</artifactId> - <version>1.2.5.GA</version> - </docletArtifact> - <additionalparam> - -charset UTF-8 - -docencoding UTF-8 - -version - -author - -breakiterator - -windowtitle "${project.name} ${project.version} API Reference" - -doctitle "${project.name} ${project.version} API Reference" - -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved." - -link http://java.sun.com/javase/6/docs/api/ - -sourceclasspath ${project.build.outputDirectory} - </additionalparam> - <encoding>UTF-8</encoding> - </configuration> - </plugin> - </plugins> - </reporting> -</project> Copied: xmlkey/tags/1.0.0.alpha1/skms/pom.xml (from rev 295, xmlkey/trunk/skms/pom.xml) =================================================================== --- xmlkey/tags/1.0.0.alpha1/skms/pom.xml (rev 0) +++ xmlkey/tags/1.0.0.alpha1/skms/pom.xml 2009-02-02 22:35:56 UTC (rev 296) @@ -0,0 +1,125 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.jboss.identity</groupId> + <artifactId>jboss-xmlkey-parent</artifactId> + <version>1.0.0.alpha1</version> + <relativePath>../parent</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>jboss-skms</artifactId> + <packaging>jar</packaging> + <name>JBoss skms </name> + <url>http://labs.jboss.org/portal/jbosssecurity/</url> + <description>JBoss SKMS.</description> + <licenses> + <license> + <name>lgpl</name> + <url>http://repository.jboss.com/licenses/lgpl.txt</url> + </license> + </licenses> + <organization> + <name>JBoss Inc.</name> + <url>http://www.jboss.org</url> + </organization> + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/repos/jbossidentity/xmlkey/tags/1....</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossidentity/xmlkey/tags/1.0.0.alpha1</developerConnection> + <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/repos/jbossidentity/xmlkey/tag...</url> + </scm> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.4.3</version> + <configuration> + <printSummary>true</printSummary> + <disableXmlReport>false</disableXmlReport> + <testFailureIgnore>false</testFailureIgnore> + <includes> + <include>**/**TestCase.java</include> + </includes> + <forkMode>pertest</forkMode> + <argLine>-Djava.endorsed.dirs=${basedir}/src/test/resources/endorsed</argLine> + <useFile>false</useFile> + <trimStackTrace>false</trimStackTrace> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.jboss.identity</groupId> + <artifactId>jboss-identity-xmlsec-model</artifactId> + <version>1.0.0.alpha1</version> + </dependency> + <dependency> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + <dependency> + <groupId>apache-xmlsec</groupId> + <artifactId>xmlsec</artifactId> + </dependency> + <dependency> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-api</artifactId> + </dependency> + <dependency> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-impl</artifactId> + </dependency> + <dependency> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>sun-jaf</groupId> + <artifactId>activation</artifactId> + <version>1.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>codehaus-stax</groupId> + <artifactId>stax</artifactId> + <version>1.1.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <doclet>org.jboss.apiviz.APIviz</doclet> + <docletArtifact> + <groupId>org.jboss.apiviz</groupId> + <artifactId>apiviz</artifactId> + <version>1.2.5.GA</version> + </docletArtifact> + <additionalparam> + -charset UTF-8 + -docencoding UTF-8 + -version + -author + -breakiterator + -windowtitle "${project.name} ${project.version} API Reference" + -doctitle "${project.name} ${project.version} API Reference" + -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved." + -link http://java.sun.com/javase/6/docs/api/ + -sourceclasspath ${project.build.outputDirectory} + </additionalparam> + <encoding>UTF-8</encoding> + </configuration> + </plugin> + </plugins> + </reporting> +</project> \ No newline at end of file Copied: xmlkey/tags/1.0.0.alpha1/xkms (from rev 292, xmlkey/trunk/xkms) Deleted: xmlkey/tags/1.0.0.alpha1/xkms/pom.xml =================================================================== --- xmlkey/trunk/xkms/pom.xml 2009-02-02 22:29:40 UTC (rev 292) +++ xmlkey/tags/1.0.0.alpha1/xkms/pom.xml 2009-02-02 22:35:56 UTC (rev 296) @@ -1,131 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>org.jboss.identity</groupId> - <artifactId>jboss-xmlkey-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> - <relativePath>../parent</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>jboss-xkms</artifactId> - <packaging>jar</packaging> - <name>JBoss xkms </name> - <url>http://labs.jboss.org/portal/jbosssecurity/</url> - <description>JBoss XKMS.</description> - <licenses> - <license> - <name>lgpl</name> - <url>http://repository.jboss.com/licenses/lgpl.txt</url> - </license> - </licenses> - <organization> - <name>JBoss Inc.</name> - <url>http://www.jboss.org</url> - </organization> - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/xmlkey/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/jbossidentity/xmlkey/trunk</developerConnection> - <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossidentity/xkms/trunk</url> - </scm> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.3</version> - <configuration> - <printSummary>true</printSummary> - <disableXmlReport>false</disableXmlReport> - <testFailureIgnore>false</testFailureIgnore> - <includes> - <include>**/**TestCase.java</include> - </includes> - <forkMode>pertest</forkMode> - <argLine>-Djava.endorsed.dirs=${basedir}/src/test/resources/endorsed</argLine> - <useFile>false</useFile> - <trimStackTrace>false</trimStackTrace> - </configuration> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>org.jboss.identity</groupId> - <artifactId>jboss-identity-xmlsec-model</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.identity</groupId> - <artifactId>jboss-xmlkey-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>apache-log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - <dependency> - <groupId>apache-xmlsec</groupId> - <artifactId>xmlsec</artifactId> - </dependency> - <dependency> - <groupId>sun-jaxb</groupId> - <artifactId>jaxb-api</artifactId> - </dependency> - <dependency> - <groupId>sun-jaxb</groupId> - <artifactId>jaxb-impl</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>sun-jaf</groupId> - <artifactId>activation</artifactId> - <version>1.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>codehaus-stax</groupId> - <artifactId>stax</artifactId> - <version>1.1.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <doclet>org.jboss.apiviz.APIviz</doclet> - <docletArtifact> - <groupId>org.jboss.apiviz</groupId> - <artifactId>apiviz</artifactId> - <version>1.2.5.GA</version> - </docletArtifact> - <additionalparam> - -charset UTF-8 - -docencoding UTF-8 - -version - -author - -breakiterator - -windowtitle "${project.name} ${project.version} API Reference" - -doctitle "${project.name} ${project.version} API Reference" - -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved." - -link http://java.sun.com/javase/6/docs/api/ - -sourceclasspath ${project.build.outputDirectory} - </additionalparam> - <encoding>UTF-8</encoding> - </configuration> - </plugin> - </plugins> - </reporting> -</project> Copied: xmlkey/tags/1.0.0.alpha1/xkms/pom.xml (from rev 295, xmlkey/trunk/xkms/pom.xml) =================================================================== --- xmlkey/tags/1.0.0.alpha1/xkms/pom.xml (rev 0) +++ xmlkey/tags/1.0.0.alpha1/xkms/pom.xml 2009-02-02 22:35:56 UTC (rev 296) @@ -0,0 +1,131 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.jboss.identity</groupId> + <artifactId>jboss-xmlkey-parent</artifactId> + <version>1.0.0.alpha1</version> + <relativePath>../parent</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>jboss-xkms</artifactId> + <packaging>jar</packaging> + <name>JBoss xkms </name> + <url>http://labs.jboss.org/portal/jbosssecurity/</url> + <description>JBoss XKMS.</description> + <licenses> + <license> + <name>lgpl</name> + <url>http://repository.jboss.com/licenses/lgpl.txt</url> + </license> + </licenses> + <organization> + <name>JBoss Inc.</name> + <url>http://www.jboss.org</url> + </organization> + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/repos/jbossidentity/xmlkey/tags/1....</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossidentity/xmlkey/tags/1.0.0.alpha1</developerConnection> + <url>scm:svn:https://svn.jboss.org/repos/jbossidentity/xmlkey/tags/1.0.0.alpha1</url> + </scm> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.4.3</version> + <configuration> + <printSummary>true</printSummary> + <disableXmlReport>false</disableXmlReport> + <testFailureIgnore>false</testFailureIgnore> + <includes> + <include>**/**TestCase.java</include> + </includes> + <forkMode>pertest</forkMode> + <argLine>-Djava.endorsed.dirs=${basedir}/src/test/resources/endorsed</argLine> + <useFile>false</useFile> + <trimStackTrace>false</trimStackTrace> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.jboss.identity</groupId> + <artifactId>jboss-identity-xmlsec-model</artifactId> + <version>1.0.0.alpha1</version> + </dependency> + <dependency> + <groupId>org.jboss.identity</groupId> + <artifactId>jboss-xmlkey-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + <dependency> + <groupId>apache-xmlsec</groupId> + <artifactId>xmlsec</artifactId> + </dependency> + <dependency> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-api</artifactId> + </dependency> + <dependency> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-impl</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>sun-jaf</groupId> + <artifactId>activation</artifactId> + <version>1.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>codehaus-stax</groupId> + <artifactId>stax</artifactId> + <version>1.1.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <doclet>org.jboss.apiviz.APIviz</doclet> + <docletArtifact> + <groupId>org.jboss.apiviz</groupId> + <artifactId>apiviz</artifactId> + <version>1.2.5.GA</version> + </docletArtifact> + <additionalparam> + -charset UTF-8 + -docencoding UTF-8 + -version + -author + -breakiterator + -windowtitle "${project.name} ${project.version} API Reference" + -doctitle "${project.name} ${project.version} API Reference" + -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved." + -link http://java.sun.com/javase/6/docs/api/ + -sourceclasspath ${project.build.outputDirectory} + </additionalparam> + <encoding>UTF-8</encoding> + </configuration> + </plugin> + </plugins> + </reporting> +</project> \ No newline at end of file

15 years, 3 months

1
0
0 / 0

JBoss Identity SVN: r295 - in xmlkey/trunk: assembly and 4 other directories.

by jboss-identity-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2009-02-02 17:35:51 -0500 (Mon, 02 Feb 2009) New Revision: 295 Modified: xmlkey/trunk/assembly/pom.xml xmlkey/trunk/common/pom.xml xmlkey/trunk/parent/pom.xml xmlkey/trunk/pom.xml xmlkey/trunk/skms/pom.xml xmlkey/trunk/xkms/pom.xml Log: [maven-release-plugin] prepare release 1.0.0.alpha1 Modified: xmlkey/trunk/assembly/pom.xml =================================================================== --- xmlkey/trunk/assembly/pom.xml 2009-02-02 22:32:43 UTC (rev 294) +++ xmlkey/trunk/assembly/pom.xml 2009-02-02 22:35:51 UTC (rev 295) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.identity</groupId> <artifactId>jboss-xmlkey-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.alpha1</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: xmlkey/trunk/common/pom.xml =================================================================== --- xmlkey/trunk/common/pom.xml 2009-02-02 22:32:43 UTC (rev 294) +++ xmlkey/trunk/common/pom.xml 2009-02-02 22:35:51 UTC (rev 295) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.identity</groupId> <artifactId>jboss-xmlkey-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.alpha1</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -22,9 +22,9 @@ <url>http://www.jboss.org</url> </organization> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/xmlkey/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/jbossidentity/xmlkey/trunk</developerConnection> - <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossidentity/xmlkey/trunk</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/repos/jbossidentity/xmlkey/tags/1....</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossidentity/xmlkey/tags/1.0.0.alpha1</developerConnection> + <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/repos/jbossidentity/xmlkey/tag...</url> </scm> <build> <plugins> @@ -104,7 +104,7 @@ -breakiterator -windowtitle "${project.name} ${project.version} API Reference" -doctitle "${project.name} ${project.version} API Reference" - -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved." + -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved." -link http://java.sun.com/javase/6/docs/api/ -sourceclasspath ${project.build.outputDirectory} </additionalparam> @@ -113,4 +113,4 @@ </plugin> </plugins> </reporting> -</project> +</project> \ No newline at end of file Modified: xmlkey/trunk/parent/pom.xml =================================================================== --- xmlkey/trunk/parent/pom.xml 2009-02-02 22:32:43 UTC (rev 294) +++ xmlkey/trunk/parent/pom.xml 2009-02-02 22:35:51 UTC (rev 295) @@ -8,7 +8,7 @@ <groupId>org.jboss.identity</groupId> <artifactId>jboss-xmlkey-parent</artifactId> <packaging>pom</packaging> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.alpha1</version> <name>JBoss XMLKey Federation- Parent</name> <url>http://labs.jboss.org/portal/jbosssecurity/</url> <description>JBoss XMLKey is an implementation of XML Based Key Management</description> @@ -23,8 +23,8 @@ <url>http://www.jboss.org</url> </organization> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/xmlkey/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossidentity/xmlkey/trunk</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/xmlkey/tags/1.0.0.al...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossidentity/xmlkey/tags/1.0.0.alpha1</developerConnection> </scm> <build> Modified: xmlkey/trunk/pom.xml =================================================================== --- xmlkey/trunk/pom.xml 2009-02-02 22:32:43 UTC (rev 294) +++ xmlkey/trunk/pom.xml 2009-02-02 22:35:51 UTC (rev 295) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.identity</groupId> <artifactId>jboss-xmlkey-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.alpha1</version> <relativePath>parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: xmlkey/trunk/skms/pom.xml =================================================================== --- xmlkey/trunk/skms/pom.xml 2009-02-02 22:32:43 UTC (rev 294) +++ xmlkey/trunk/skms/pom.xml 2009-02-02 22:35:51 UTC (rev 295) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.identity</groupId> <artifactId>jboss-xmlkey-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.alpha1</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -22,9 +22,9 @@ <url>http://www.jboss.org</url> </organization> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/xmlkey/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/jbossidentity/xmlkey/trunk</developerConnection> - <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossidentity/xmlkey/trunk</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/repos/jbossidentity/xmlkey/tags/1....</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossidentity/xmlkey/tags/1.0.0.alpha1</developerConnection> + <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/repos/jbossidentity/xmlkey/tag...</url> </scm> <build> <plugins> @@ -113,7 +113,7 @@ -breakiterator -windowtitle "${project.name} ${project.version} API Reference" -doctitle "${project.name} ${project.version} API Reference" - -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved." + -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved." -link http://java.sun.com/javase/6/docs/api/ -sourceclasspath ${project.build.outputDirectory} </additionalparam> @@ -122,4 +122,4 @@ </plugin> </plugins> </reporting> -</project> +</project> \ No newline at end of file Modified: xmlkey/trunk/xkms/pom.xml =================================================================== --- xmlkey/trunk/xkms/pom.xml 2009-02-02 22:32:43 UTC (rev 294) +++ xmlkey/trunk/xkms/pom.xml 2009-02-02 22:35:51 UTC (rev 295) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.identity</groupId> <artifactId>jboss-xmlkey-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.alpha1</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -22,9 +22,9 @@ <url>http://www.jboss.org</url> </organization> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/xmlkey/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/jbossidentity/xmlkey/trunk</developerConnection> - <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossidentity/xkms/trunk</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/repos/jbossidentity/xmlkey/tags/1....</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossidentity/xmlkey/tags/1.0.0.alpha1</developerConnection> + <url>scm:svn:https://svn.jboss.org/repos/jbossidentity/xmlkey/tags/1.0.0.alpha1</url> </scm> <build> <plugins> @@ -119,7 +119,7 @@ -breakiterator -windowtitle "${project.name} ${project.version} API Reference" -doctitle "${project.name} ${project.version} API Reference" - -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved." + -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved." -link http://java.sun.com/javase/6/docs/api/ -sourceclasspath ${project.build.outputDirectory} </additionalparam> @@ -128,4 +128,4 @@ </plugin> </plugins> </reporting> -</project> +</project> \ No newline at end of file

15 years, 3 months

1
0
0 / 0

JBoss Identity SVN: r294 - in xmlkey/trunk: xkms and 1 other directory.

by jboss-identity-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2009-02-02 17:32:43 -0500 (Mon, 02 Feb 2009) New Revision: 294 Modified: xmlkey/trunk/skms/pom.xml xmlkey/trunk/xkms/pom.xml Log: upd dep Modified: xmlkey/trunk/skms/pom.xml =================================================================== --- xmlkey/trunk/skms/pom.xml 2009-02-02 22:30:11 UTC (rev 293) +++ xmlkey/trunk/skms/pom.xml 2009-02-02 22:32:43 UTC (rev 294) @@ -51,7 +51,7 @@ <dependency> <groupId>org.jboss.identity</groupId> <artifactId>jboss-identity-xmlsec-model</artifactId> - <version>${project.version}</version> + <version>1.0.0.alpha1</version> </dependency> <dependency> <groupId>apache-log4j</groupId> Modified: xmlkey/trunk/xkms/pom.xml =================================================================== --- xmlkey/trunk/xkms/pom.xml 2009-02-02 22:30:11 UTC (rev 293) +++ xmlkey/trunk/xkms/pom.xml 2009-02-02 22:32:43 UTC (rev 294) @@ -51,7 +51,7 @@ <dependency> <groupId>org.jboss.identity</groupId> <artifactId>jboss-identity-xmlsec-model</artifactId> - <version>${project.version}</version> + <version>1.0.0.alpha1</version> </dependency> <dependency> <groupId>org.jboss.identity</groupId>

15 years, 3 months

1
0
0 / 0

JBoss Identity SVN: r293 - xmlkey/trunk.

by jboss-identity-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2009-02-02 17:30:11 -0500 (Mon, 02 Feb 2009) New Revision: 293 Modified: xmlkey/trunk/ Log: svn ign Property changes on: xmlkey/trunk ___________________________________________________________________ Name: svn:ignore + target target-eclipse .settings .metadata

15 years, 3 months

1
0
0 / 0

JBoss Identity SVN: r292 - in xmlkey/trunk/common: src and 8 other directories.

by jboss-identity-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2009-02-02 17:29:40 -0500 (Mon, 02 Feb 2009) New Revision: 292 Modified: xmlkey/trunk/common/ xmlkey/trunk/common/src/ xmlkey/trunk/common/src/main/ xmlkey/trunk/common/src/main/java/ xmlkey/trunk/common/src/main/java/org/ xmlkey/trunk/common/src/main/java/org/jboss/ xmlkey/trunk/common/src/main/java/org/jboss/identity/ xmlkey/trunk/common/src/main/java/org/jboss/identity/xmlkey/ xmlkey/trunk/common/src/main/java/org/jboss/identity/xmlkey/common/ xmlkey/trunk/common/src/main/resources/ Log: revursive svn ignore Property changes on: xmlkey/trunk/common ___________________________________________________________________ Name: svn:ignore - target + target target-eclipse .settings .metadata Property changes on: xmlkey/trunk/common/src ___________________________________________________________________ Name: svn:ignore + target target-eclipse .settings .metadata Property changes on: xmlkey/trunk/common/src/main ___________________________________________________________________ Name: svn:ignore + target target-eclipse .settings .metadata Property changes on: xmlkey/trunk/common/src/main/java ___________________________________________________________________ Name: svn:ignore + target target-eclipse .settings .metadata Property changes on: xmlkey/trunk/common/src/main/java/org ___________________________________________________________________ Name: svn:ignore + target target-eclipse .settings .metadata Property changes on: xmlkey/trunk/common/src/main/java/org/jboss ___________________________________________________________________ Name: svn:ignore + target target-eclipse .settings .metadata Property changes on: xmlkey/trunk/common/src/main/java/org/jboss/identity ___________________________________________________________________ Name: svn:ignore + target target-eclipse .settings .metadata Property changes on: xmlkey/trunk/common/src/main/java/org/jboss/identity/xmlkey ___________________________________________________________________ Name: svn:ignore + target target-eclipse .settings .metadata Property changes on: xmlkey/trunk/common/src/main/java/org/jboss/identity/xmlkey/common ___________________________________________________________________ Name: svn:ignore + target target-eclipse .settings .metadata Property changes on: xmlkey/trunk/common/src/main/resources ___________________________________________________________________ Name: svn:ignore + target target-eclipse .settings .metadata

15 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jboss-identity-commits February 2009