Seam SVN: r14240 - branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/util.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2011-10-28 13:36:08 -0400 (Fri, 28 Oct 2011)
New Revision: 14240
Modified:
branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/util/ProxyFactory.java
Log:
JBSEAM-4840 aplied JAVASSIST fix for JASSIST-66
Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/util/ProxyFactory.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/util/ProxyFactory.java 2011-10-28 17:13:21 UTC (rev 14239)
+++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/util/ProxyFactory.java 2011-10-28 17:36:08 UTC (rev 14240)
@@ -860,6 +860,9 @@
code.addGetstatic(thisClassName, HOLDER, HOLDER_TYPE);
code.addAstore(arrayVar);
code.addAload(arrayVar);
+
+ callFind2Methods(code, meth.getName(), delegatorName, origIndex, desc, arrayVar);
+ /*
code.addIconst(origIndex);
code.addOpcode(Opcode.AALOAD);
code.addOpcode(Opcode.IFNONNULL);
@@ -870,7 +873,7 @@
callFindMethod(code, "findMethod", arrayVar, delIndex, delegatorName, desc);
int pc2 = code.currentPc();
- code.write16bit(pc, pc2 - pc + 1);
+ code.write16bit(pc, pc2 - pc + 1);*/
code.addAload(0);
code.addGetfield(thisClassName, HANDLER, HANDLER_TYPE);
code.addAload(0);
@@ -893,10 +896,10 @@
CodeAttribute ca = code.toCodeAttribute();
forwarder.setCodeAttribute(ca);
- StackMapTable.Writer writer = new StackMapTable.Writer(32);
+ /*StackMapTable.Writer writer = new StackMapTable.Writer(32);
writer.appendFrame(pc2, new int[] { StackMapTable.OBJECT },
new int[] { cp.addClassInfo(HOLDER_TYPE) });
- ca.setAttribute(writer.toStackMapTable(cp));
+ ca.setAttribute(writer.toStackMapTable(cp));*/
return forwarder;
}
@@ -995,6 +998,27 @@
}
}
+ private static void callFind2Methods(Bytecode code, String superMethod, String thisMethod,
+ int index, String desc, int arrayVar)
+ {
+ String findClass = RuntimeSupport.class.getName();
+ String findDesc = "(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;[Ljava/lang/reflect/Method;)V";
+ code.addAload(0);
+ code.addLdc(superMethod);
+ if (thisMethod == null)
+ {
+ code.addOpcode(Opcode.ACONST_NULL);
+ }
+ else
+ {
+ code.addLdc(thisMethod);
+ }
+ code.addIconst(index);
+ code.addLdc(desc);
+ code.addAload(arrayVar);
+ code.addInvokestatic(findClass, "find2Methods", findDesc);
+ }
+
private static int makeWrapper(Bytecode code, Class type, int regno) {
int index = FactoryHelper.typeIndex(type);
String wrapper = FactoryHelper.wrapperTypes[index];
13 years, 2 months
Seam SVN: r14239 - in branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam: security/permission and 1 other directories.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2011-10-28 13:13:21 -0400 (Fri, 28 Oct 2011)
New Revision: 14239
Modified:
branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/security/management/JpaIdentityStore.java
branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/security/permission/ClassIdentifierStrategy.java
branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/security/permission/EntityIdentifierStrategy.java
branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/security/permission/IdentifierPolicy.java
branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/security/permission/IdentifierStrategy.java
branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/security/permission/PermissionMetadata.java
branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/util/AnnotatedBeanProperty.java
Log:
JBSEAM-4829 clusterable changes
Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/security/management/JpaIdentityStore.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/security/management/JpaIdentityStore.java 2011-10-28 15:33:42 UTC (rev 14238)
+++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/security/management/JpaIdentityStore.java 2011-10-28 17:13:21 UTC (rev 14239)
@@ -57,6 +57,9 @@
@BypassInterceptors
public class JpaIdentityStore implements IdentityStore, Serializable
{
+
+ private static final long serialVersionUID = -3627993296654916436L;
+
public static final String AUTHENTICATED_USER = "org.jboss.seam.security.management.authenticatedUser";
public static final String EVENT_USER_CREATED = "org.jboss.seam.security.management.userCreated";
Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/security/permission/ClassIdentifierStrategy.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/security/permission/ClassIdentifierStrategy.java 2011-10-28 15:33:42 UTC (rev 14238)
+++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/security/permission/ClassIdentifierStrategy.java 2011-10-28 17:13:21 UTC (rev 14239)
@@ -1,5 +1,6 @@
package org.jboss.seam.security.permission;
+import java.io.Serializable;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -11,11 +12,13 @@
*
* @author Shane Bryzak
*/
-public class ClassIdentifierStrategy implements IdentifierStrategy
+public class ClassIdentifierStrategy implements IdentifierStrategy, Serializable
{
- private Map<Class,String> identifierNames = new ConcurrentHashMap<Class,String>();
+ private static final long serialVersionUID = 3338883246522630571L;
- public boolean canIdentify(Class targetClass)
+ private Map<Class<?>,String> identifierNames = new ConcurrentHashMap<Class<?>,String>();
+
+ public boolean canIdentify(Class<?> targetClass)
{
return Class.class.equals(targetClass);
}
@@ -27,10 +30,10 @@
throw new IllegalArgumentException("Target [" + target + "] must be instance of Class");
}
- return getIdentifierName((Class) target);
+ return getIdentifierName((Class<?>) target);
}
- private String getIdentifierName(Class cls)
+ private String getIdentifierName(Class<?> cls)
{
if (!identifierNames.containsKey(cls))
{
Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/security/permission/EntityIdentifierStrategy.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/security/permission/EntityIdentifierStrategy.java 2011-10-28 15:33:42 UTC (rev 14238)
+++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/security/permission/EntityIdentifierStrategy.java 2011-10-28 17:13:21 UTC (rev 14239)
@@ -1,5 +1,6 @@
package org.jboss.seam.security.permission;
+import java.io.Serializable;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -19,37 +20,49 @@
*
* @author Shane Bryzak
*/
-public class EntityIdentifierStrategy implements IdentifierStrategy
+public class EntityIdentifierStrategy implements IdentifierStrategy, Serializable
{
- private ValueExpression<EntityManager> entityManager;
+
+ private static final long serialVersionUID = 12456789L;
+
+ private transient ValueExpression<EntityManager> entityManager;
- private PersistenceProvider persistenceProvider;
+ private transient PersistenceProvider persistenceProvider;
- private Map<Class,String> identifierNames = new ConcurrentHashMap<Class,String>();
-
- public EntityIdentifierStrategy()
+ private Map<Class <?>,String> identifierNames = new ConcurrentHashMap<Class <?>,String>();
+
+ public void init()
{
- persistenceProvider = (PersistenceProvider) Component.getInstance(PersistenceProvider.class, true);
-
+ if (persistenceProvider == null)
+ {
+ persistenceProvider = (PersistenceProvider) Component.getInstance(PersistenceProvider.class, true);
+ }
+
if (entityManager == null)
{
- entityManager = Expressions.instance().createValueExpression("#{entityManager}",
- EntityManager.class);
- }
+ entityManager = Expressions.instance().createValueExpression("#{entityManager}", EntityManager.class);
+ }
+
}
+
+ public EntityIdentifierStrategy()
+ {
+ init();
+ }
- public boolean canIdentify(Class targetClass)
+ public boolean canIdentify(Class<?> targetClass)
{
return targetClass.isAnnotationPresent(Entity.class);
}
public String getIdentifier(Object target)
{
- return String.format("%s:%s", getIdentifierName(target.getClass()),
- persistenceProvider.getId(target, lookupEntityManager()).toString());
+ if(persistenceProvider == null) init();
+ Object persProviderId = persistenceProvider.getId(target, lookupEntityManager()).toString();
+ return String.format("%s:%s", getIdentifierName(target.getClass()), persProviderId);
}
- private String getIdentifierName(Class cls)
+ private String getIdentifierName(Class<? extends Object> cls)
{
if (!identifierNames.containsKey(cls))
{
@@ -57,7 +70,7 @@
if (cls.isAnnotationPresent(Identifier.class))
{
- Identifier identifier = (Identifier) cls.getAnnotation(Identifier.class);
+ Identifier identifier = cls.getAnnotation(Identifier.class);
if ( !Strings.isEmpty(identifier.name()) )
{
name = identifier.name();
@@ -83,6 +96,7 @@
private EntityManager lookupEntityManager()
{
+ if(entityManager == null) init();
return entityManager.getValue();
}
}
Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/security/permission/IdentifierPolicy.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/security/permission/IdentifierPolicy.java 2011-10-28 15:33:42 UTC (rev 14238)
+++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/security/permission/IdentifierPolicy.java 2011-10-28 17:13:21 UTC (rev 14239)
@@ -2,6 +2,7 @@
import static org.jboss.seam.ScopeType.APPLICATION;
+import java.io.Serializable;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
@@ -25,9 +26,12 @@
@Scope(APPLICATION)
@BypassInterceptors
@Install(precedence = Install.BUILT_IN)
-public class IdentifierPolicy
+public class IdentifierPolicy implements Serializable
{
- private Map<Class,IdentifierStrategy> strategies = new ConcurrentHashMap<Class,IdentifierStrategy>();
+
+ private static final long serialVersionUID = 684295244567560969L;
+
+ private Map<Class <?>,IdentifierStrategy> strategies = new ConcurrentHashMap<Class<?>,IdentifierStrategy>();
private Set<IdentifierStrategy> registeredStrategies = new HashSet<IdentifierStrategy>();
Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/security/permission/IdentifierStrategy.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/security/permission/IdentifierStrategy.java 2011-10-28 15:33:42 UTC (rev 14238)
+++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/security/permission/IdentifierStrategy.java 2011-10-28 17:13:21 UTC (rev 14239)
@@ -7,6 +7,6 @@
*/
public interface IdentifierStrategy
{
- boolean canIdentify(Class targetClass);
+ boolean canIdentify(Class<?> targetClass);
String getIdentifier(Object target);
}
Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/security/permission/PermissionMetadata.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/security/permission/PermissionMetadata.java 2011-10-28 15:33:42 UTC (rev 14238)
+++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/security/permission/PermissionMetadata.java 2011-10-28 17:13:21 UTC (rev 14239)
@@ -1,5 +1,6 @@
package org.jboss.seam.security.permission;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -17,12 +18,13 @@
*
* @author Shane Bryzak
*/
-public class PermissionMetadata
+public class PermissionMetadata implements Serializable
{
- private Map<Class,Boolean> usesActionMask = new HashMap<Class,Boolean>();
- private Map<Class,Map<String,Long>> classActions = new HashMap<Class,Map<String,Long>>();
+ private static final long serialVersionUID = 7407543457388705950L;
+ private Map<Class<?>,Boolean> usesActionMask = new HashMap<Class<?>,Boolean>();
+ private Map<Class<?>,Map<String,Long>> classActions = new HashMap<Class<?>,Map<String,Long>>();
- private synchronized void initClassActions(Class cls)
+ private synchronized void initClassActions(Class<?> cls)
{
if (!classActions.containsKey(cls))
{
@@ -86,9 +88,9 @@
protected class ActionSet
{
private Set<String> members = new HashSet<String>();
- private Class targetClass;
+ private Class<?> targetClass;
- public ActionSet(Class targetClass, String members)
+ public ActionSet(Class<?> targetClass, String members)
{
this.targetClass = targetClass;
addMembers(members);
@@ -179,14 +181,14 @@
}
}
- public ActionSet createActionSet(Class targetClass, String members)
+ public ActionSet createActionSet(Class<?> targetClass, String members)
{
if (!classActions.containsKey(targetClass)) initClassActions(targetClass);
return new ActionSet(targetClass, members);
}
- public List<String> listAllowableActions(Class targetClass)
+ public List<String> listAllowableActions(Class<?> targetClass)
{
if (!classActions.containsKey(targetClass)) initClassActions(targetClass);
Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/util/AnnotatedBeanProperty.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/util/AnnotatedBeanProperty.java 2011-10-28 15:33:42 UTC (rev 14238)
+++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/util/AnnotatedBeanProperty.java 2011-10-28 17:13:21 UTC (rev 14239)
@@ -1,6 +1,7 @@
package org.jboss.seam.util;
import java.beans.Introspector;
+import java.io.Serializable;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
@@ -12,11 +13,12 @@
*
* @author Shane Bryzak
*/
-public class AnnotatedBeanProperty<T extends Annotation>
+public class AnnotatedBeanProperty<T extends Annotation> implements Serializable
{
- private Field propertyField;
- private Method propertyGetter;
- private Method propertySetter;
+ private static final long serialVersionUID = 2508430507136805635L;
+ private transient Field propertyField;
+ private transient Method propertyGetter;
+ private transient Method propertySetter;
private String name;
private Type propertyType;
private T annotation;
@@ -24,18 +26,28 @@
private boolean isFieldProperty;
private boolean set = false;
- public AnnotatedBeanProperty(Class<?> cls, Class<T> annotationClass)
+ private Class<?> cls;
+ private Class<? extends Annotation> annotationClass;
+
+ public AnnotatedBeanProperty(Class<?> cls, Class<? extends Annotation> annotationClass)
{
- // First check declared fields
- for (Field f : cls.getDeclaredFields())
- {
- if (f.isAnnotationPresent(annotationClass))
+ this.cls = cls;
+ this.annotationClass = annotationClass;
+ init();
+ }
+
+ private void init()
+ {
+ // First check declared fields
+ for (Field f : cls.getDeclaredFields())
{
- setupFieldProperty(f);
- this.annotation = f.getAnnotation(annotationClass);
- set = true;
- return;
- }
+ if (f.isAnnotationPresent(annotationClass))
+ {
+ setupFieldProperty(f);
+ this.annotation = (T) f.getAnnotation(annotationClass);
+ set = true;
+ return;
+ }
}
// Then check public fields, in case it's inherited
@@ -43,7 +55,7 @@
{
if (f.isAnnotationPresent(annotationClass))
{
- this.annotation = f.getAnnotation(annotationClass);
+ this.annotation = (T) f.getAnnotation(annotationClass);
setupFieldProperty(f);
set = true;
return;
@@ -55,7 +67,7 @@
{
if (m.isAnnotationPresent(annotationClass))
{
- this.annotation = m.getAnnotation(annotationClass);
+ this.annotation = (T) m.getAnnotation(annotationClass);
String methodName = m.getName();
if ( m.getName().startsWith("get") )
@@ -84,6 +96,33 @@
}
}
+ public Field getPropertyField()
+ {
+ if (propertyField == null)
+ {
+ init();
+ }
+ return propertyField;
+ }
+
+ public Method getPropertyGetter()
+ {
+ if (propertyGetter == null)
+ {
+ init();
+ }
+ return propertyGetter;
+ }
+
+ public Method getPropertySetter()
+ {
+ if (propertySetter == null)
+ {
+ init();
+ }
+ return propertySetter;
+ }
+
private void setupFieldProperty(Field propertyField)
{
this.propertyField = propertyField;
@@ -96,11 +135,11 @@
{
if (isFieldProperty)
{
- Reflections.setAndWrap(propertyField, bean, value);
+ Reflections.setAndWrap(getPropertyField(), bean, value);
}
else
{
- Reflections.invokeAndWrap(propertySetter, bean, value);
+ Reflections.invokeAndWrap(getPropertySetter(), bean, value);
}
}
@@ -108,11 +147,11 @@
{
if (isFieldProperty)
{
- return Reflections.getAndWrap(propertyField, bean);
+ return Reflections.getAndWrap(getPropertyField(), bean);
}
else
{
- return Reflections.invokeAndWrap(propertyGetter, bean);
+ return Reflections.invokeAndWrap(getPropertyGetter(), bean);
}
}
@@ -123,7 +162,7 @@
public T getAnnotation()
{
- return annotation;
+ return (T) annotation;
}
public Type getPropertyType()
13 years, 2 months
Seam SVN: r14238 - in branches/community/Seam_2_3: examples/quartz/quartz-ejb and 3 other directories.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2011-10-28 11:33:42 -0400 (Fri, 28 Oct 2011)
New Revision: 14238
Modified:
branches/community/Seam_2_3/build/settings.xml
branches/community/Seam_2_3/examples/quartz/quartz-ejb/pom.xml
branches/community/Seam_2_3/jboss-seam-parent/pom.xml
branches/community/Seam_2_3/jboss-seam-rss/pom.xml
branches/community/Seam_2_3/jboss-seam/pom.xml
Log:
JBSEAM-4850 - disabled jboss deprecated repository and upgrade quartz to 1.6.5 and changed commons-httpclient groupId
Modified: branches/community/Seam_2_3/build/settings.xml
===================================================================
--- branches/community/Seam_2_3/build/settings.xml 2011-10-28 15:33:26 UTC (rev 14237)
+++ branches/community/Seam_2_3/build/settings.xml 2011-10-28 15:33:42 UTC (rev 14238)
@@ -254,7 +254,7 @@
<activeProfiles>
<activeProfile>jboss-public-repository</activeProfile>
- <activeProfile>jboss-deprecated-repository</activeProfile>
+<!-- <activeProfile>jboss-deprecated-repository</activeProfile> -->
</activeProfiles>
Modified: branches/community/Seam_2_3/examples/quartz/quartz-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/quartz/quartz-ejb/pom.xml 2011-10-28 15:33:26 UTC (rev 14237)
+++ branches/community/Seam_2_3/examples/quartz/quartz-ejb/pom.xml 2011-10-28 15:33:42 UTC (rev 14238)
@@ -49,7 +49,7 @@
<artifactId>jsf-api</artifactId>
</dependency>
<dependency>
- <groupId>quartz</groupId>
+ <groupId>org.opensymphony.quartz</groupId>
<artifactId>quartz</artifactId>
</dependency>
</dependencies>
Modified: branches/community/Seam_2_3/jboss-seam/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam/pom.xml 2011-10-28 15:33:26 UTC (rev 14237)
+++ branches/community/Seam_2_3/jboss-seam/pom.xml 2011-10-28 15:33:42 UTC (rev 14238)
@@ -406,7 +406,7 @@
</dependency>
<dependency>
- <groupId>quartz</groupId>
+ <groupId>org.opensymphony.quartz</groupId>
<artifactId>quartz</artifactId>
<optional>true</optional>
</dependency>
Modified: branches/community/Seam_2_3/jboss-seam-parent/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2011-10-28 15:33:26 UTC (rev 14237)
+++ branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2011-10-28 15:33:42 UTC (rev 14238)
@@ -563,7 +563,7 @@
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
+ <version>3.1-jbossorg-1</version>
</dependency>
<dependency>
@@ -952,9 +952,9 @@
</dependency>
<dependency>
- <groupId>quartz</groupId>
+ <groupId>org.opensymphony.quartz</groupId>
<artifactId>quartz</artifactId>
- <version>1.6.0</version>
+ <version>1.6.5</version>
</dependency>
<dependency>
Modified: branches/community/Seam_2_3/jboss-seam-rss/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-rss/pom.xml 2011-10-28 15:33:26 UTC (rev 14237)
+++ branches/community/Seam_2_3/jboss-seam-rss/pom.xml 2011-10-28 15:33:42 UTC (rev 14238)
@@ -15,6 +15,12 @@
<dependency>
<groupId>net.sourceforge.yarfraw</groupId>
<artifactId>yarfraw</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
13 years, 2 months
Seam SVN: r14237 - in branches/community/Seam_2_3: distribution/src/main/assembly and 5 other directories.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2011-10-28 11:33:26 -0400 (Fri, 28 Oct 2011)
New Revision: 14237
Added:
branches/community/Seam_2_3/distribution/src/main/assembly/dist-jsf12.xml
branches/community/Seam_2_3/distribution/src/main/assembly/dist-jsf2.xml
Removed:
branches/community/Seam_2_3/distribution/src/main/assembly/assembly.xml
Modified:
branches/community/Seam_2_3/distribution/pom.xml
branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/com/sun/facelets/StateWriterControl.java
branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/org/jboss/seam/debug/Contexts.java
branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/org/jboss/seam/debug/jsf2/SeamDebugPhaseListener.java
branches/community/Seam_2_3/jboss-seam-mail/src/main/java/org/jboss/seam/mail/ui/context/MailFacesContextImpl.java
branches/community/Seam_2_3/jboss-seam-parent/pom.xml
Log:
created jsf2 distribution, changed jboss-debug-jsf2 for JSF2
Modified: branches/community/Seam_2_3/distribution/pom.xml
===================================================================
--- branches/community/Seam_2_3/distribution/pom.xml 2011-10-19 21:34:20 UTC (rev 14236)
+++ branches/community/Seam_2_3/distribution/pom.xml 2011-10-28 15:33:26 UTC (rev 14237)
@@ -26,11 +26,11 @@
<configuration>
<finalName>jboss-seam-${project.version}</finalName>
<descriptors>
- <descriptor>src/main/assembly/assembly.xml</descriptor>
+ <!-- Assembly is controlled by profile for jsf2 and jsf12 -->
+ <descriptor>src/main/assembly/${assembly-config}</descriptor>
</descriptors>
<appendAssemblyId>true</appendAssemblyId>
</configuration>
-
</execution>
</executions>
</plugin>
@@ -97,10 +97,6 @@
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-debug</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-excel</artifactId>
</dependency>
<dependency>
@@ -137,10 +133,6 @@
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-ui</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-wicket</artifactId>
</dependency>
@@ -287,4 +279,42 @@
</dependencies>
+<profiles>
+ <profile>
+ <id>jsf2</id>
+ <properties>
+ <assembly-config>dist-jsf2.xml</assembly-config>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-debug-jsf2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-ui-jsf2</artifactId>
+ </dependency>
+ </dependencies>
+
+ </profile>
+ <profile>
+ <id>jsf12</id>
+ <properties>
+ <assembly-config>dist-jsf12.xml</assembly-config>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-debug</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-ui</artifactId>
+ </dependency>
+ </dependencies>
+
+ </profile>
+
+</profiles>
+
</project>
Deleted: branches/community/Seam_2_3/distribution/src/main/assembly/assembly.xml
===================================================================
--- branches/community/Seam_2_3/distribution/src/main/assembly/assembly.xml 2011-10-19 21:34:20 UTC (rev 14236)
+++ branches/community/Seam_2_3/distribution/src/main/assembly/assembly.xml 2011-10-28 15:33:26 UTC (rev 14237)
@@ -1,287 +0,0 @@
-<assembly
- xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.2 http://maven.apache.org/xsd/assembly-2.2.xsd">
-
- <id>distribution</id>
- <formats>
-<!-- <format>dir</format> -->
- <format>zip</format>
- <format>tar.gz</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
-
-
- <!-- Add distribution files -->
- <fileSets>
-
- <!-- All module sources defined in dependencies except examples -->
- <fileSet>
- <directory>target/dependency</directory>
- <outputDirectory>src</outputDirectory>
- <excludes>
- <exclude>examples/</exclude>
- </excludes>
- </fileSet>
-
- <!-- Examples only -->
- <fileSet>
- <directory>target/dependency</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>examples/</include>
- </includes>
- <excludes>
- <exclude>examples/wiki/</exclude>
- </excludes>
- </fileSet>
-
- <!-- Distribution related files -->
- <fileSet>
- <directory>src/main/assembly</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>readme.txt</include>
- <include>lgpl.txt</include>
- <include>copyright.txt</include>
- <include>changelog.txt</include>
- <include>seam21migration.txt</include>
- <include>seam2migration.txt</include>
- <include>clustering-howto.txt</include>
- <include>seam</include>
- <include>seam.bat</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../extras</directory>
- <outputDirectory>extras</outputDirectory>
- <includes>
- <include>mail-ra.rar</include>
- <include>jsUnit/**</include>
- <include>readme.txt</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../jboss-seam/target</directory>
- <outputDirectory>lib/interop</outputDirectory>
- <includes>
- <include>jboss-seam-wls-compatible.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../jboss-seam/target</directory>
- <outputDirectory>lib/interop/src</outputDirectory>
- <includes>
- <include>jboss-seam-wls-compatible-sources.jar</include>
- </includes>
- </fileSet>
- <!-- all jars from jboss-seam module dependencies
- (done this way due needs to have all scopes except test there) -->
- <fileSet>
- <directory>../jar-dependencies</directory>
- <outputDirectory>./lib</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- </fileSets>
-
- <dependencySets>
-
- <!-- some extra things Embedded bootstrap, extras etc. -->
- <dependencySet>
- <outputDirectory>.</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <includes>
- <include>org.jboss.seam:jboss-embedded-bootstrap</include>
- </includes>
- <unpack>true</unpack>
- <unpackOptions>
- <excludes>
- <exclude>META-INF/**</exclude>
- <exclude>.settings/</exclude>
- <exclude>**/.settings/</exclude>
- <exclude>.gitignore</exclude>
- <exclude>.project</exclude>
- <exclude>.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.classpath</exclude>
- </excludes>
- </unpackOptions>
- <outputFileNameMapping>${artifact.artifactId}</outputFileNameMapping>
- </dependencySet>
-
- <!-- Add necessary sources jars -->
- <dependencySet>
- <outputDirectory>lib/src</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>org.jboss.seam:*:*:sources</include>
- </includes>
- <excludes>
- <exclude>org.jboss.seam:jboss-seam-gen:*:sources</exclude>
- <exclude>org.jboss.seam:jboss-seam-jul:*:sources</exclude>
- </excludes>
- <outputFileNameMapping>${artifact.artifactId}-sources.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
-
- <!-- Add jboss-seam jars into lib folder -->
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>org.jboss.seam:jboss-seam:ejb</include>
- <include>org.jboss.seam:jboss-seam-debug:jar</include>
- <include>org.jboss.seam:jboss-seam-ui:jar</include>
- <include>org.jboss.seam:jboss-seam-excel:jar</include>
- <include>org.jboss.seam:jboss-seam-pdf:jar</include>
- <include>org.jboss.seam:jboss-seam-mail:jar</include>
- <include>org.jboss.seam:jboss-seam-rss:jar</include>
- <include>org.jboss.seam:jboss-seam-resteasy:jar</include>
- <include>org.jboss.seam:jboss-seam-wicket:jar</include>
- <include>org.jboss.seam:jboss-seam-remoting:jar</include>
- <include>org.jboss.seam:jboss-seam-flex:jar</include>
- <include>org.jboss.seam:jboss-seam-ioc:jar</include>
- <include>org.jboss.seam.embedded:jboss-embedded-api:jar</include>
- </includes>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
-
- <!-- Seam jul -->
- <dependencySet>
- <outputDirectory>lib/interop</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>org.jboss.seam:jboss-seam-jul:jar</include>
- </includes>
- <excludes>
- <exclude>org.jboss.seam:jboss-seam-jul:jar:sources</exclude>
- </excludes>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
-
- <!-- Seam jul sources -->
- <dependencySet>
- <outputDirectory>lib/interop/src</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>org.jboss.seam:jboss-seam-jul:jar:sources</include>
- </includes>
- <outputFileNameMapping>${artifact.artifactId}-sources.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
-
- <!-- Seam gen -->
- <dependencySet>
- <outputDirectory>lib/gen</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <useStrictFiltering>true</useStrictFiltering>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- <includes>
- <include>org.jboss.seam:jboss-seam-gen:jar</include>
- <include>org.hibernate:hibernate-tools:jar</include>
- <include>org.beanshell:bsh:jar</include>
- <include>org.hibernate:jtidy:jar</include>
- <include>freemarker:freemarker:jar</include>
- <include>org.eclipse.core:runtime:jar</include>
- <include>org.eclipse.equinox:common:jar</include>
- <include>org.eclipse:text:jar</include>
- <include>org.richfaces.samples:darkX:jar</include>
- <include>org.richfaces.samples:laguna:jar</include>
- <include>org.richfaces.samples:glassX:jar</include>
- <include>org.apache.ant:ant:jar</include>
- <include>org.apache.ant:ant-launcher:jar</include>
- <include>org.apache.ant:ant-nodeps:jar</include>
- </includes>
- <excludes>
- <exclude>org.jboss.seam:jboss-seam-gen:jar:sources</exclude>
- </excludes>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
-
- <dependencySet>
- <outputDirectory>lib/gen/src</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <includes>
- <include>org.jboss.seam:jboss-seam-gen:*:sources</include>
- </includes>
- <outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
-
- <dependencySet>
- <outputDirectory>./seam-gen</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <unpack>true</unpack>
- <unpackOptions>
- <excludes>
- <exclude>**/.gitignore</exclude>
- </excludes>
- </unpackOptions>
- <includes>
- <include>org.jboss.seam:jboss-seam-gen:zip:distribution</include>
- </includes>
- </dependencySet>
-
- <dependencySet>
- <outputDirectory>lib/test</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <includes>
- <include>org.jboss.seam.embedded:hibernate-all:*</include>
- <include>org.jboss.seam.embedded:jboss-embedded-all:*</include>
- <include>org.jboss.seam.embedded:thirdparty-all:*</include>
- </includes>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
-
- <!-- Pull in docbook artifacts -->
- <dependencySet>
- <outputDirectory>doc/reference/</outputDirectory>
- <unpack>true</unpack>
- <useProjectArtifact>false</useProjectArtifact>
- <includes>
- <include>org.jboss.seam:seam-reference-guide</include>
- </includes>
- <unpackOptions>
- <excludes>
- <exclude>META-INF/</exclude>
- </excludes>
- </unpackOptions>
- <outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
-
- <!-- Add necessary javadoc jars -->
- <dependencySet>
- <outputDirectory>doc/api</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <unpack>true</unpack>
- <unpackOptions>
- <excludes>
- <exclude>META-INF/</exclude>
- </excludes>
- </unpackOptions>
- <includes>
- <include>org.jboss.seam:jboss-seam:*:javadoc</include>
- </includes>
- <outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
-
- <dependencySet>
- <outputDirectory>doc/ui/apidocs</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <unpack>true</unpack>
- <unpackOptions>
- <excludes>
- <exclude>META-INF/</exclude>
- </excludes>
- </unpackOptions>
- <includes>
- <include>org.jboss.seam:jboss-seam-ui:*:javadoc</include>
- </includes>
- <outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
-
- </dependencySets>
-</assembly>
Copied: branches/community/Seam_2_3/distribution/src/main/assembly/dist-jsf12.xml (from rev 14236, branches/community/Seam_2_3/distribution/src/main/assembly/assembly.xml)
===================================================================
--- branches/community/Seam_2_3/distribution/src/main/assembly/dist-jsf12.xml (rev 0)
+++ branches/community/Seam_2_3/distribution/src/main/assembly/dist-jsf12.xml 2011-10-28 15:33:26 UTC (rev 14237)
@@ -0,0 +1,287 @@
+<assembly
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.2 http://maven.apache.org/xsd/assembly-2.2.xsd">
+
+ <id>distribution</id>
+ <formats>
+<!-- <format>dir</format> -->
+ <format>zip</format>
+ <format>tar.gz</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+
+ <!-- Add distribution files -->
+ <fileSets>
+
+ <!-- All module sources defined in dependencies except examples -->
+ <fileSet>
+ <directory>target/dependency</directory>
+ <outputDirectory>src</outputDirectory>
+ <excludes>
+ <exclude>examples/</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- Examples only -->
+ <fileSet>
+ <directory>target/dependency</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>examples/</include>
+ </includes>
+ <excludes>
+ <exclude>examples/wiki/</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- Distribution related files -->
+ <fileSet>
+ <directory>src/main/assembly</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>readme.txt</include>
+ <include>lgpl.txt</include>
+ <include>copyright.txt</include>
+ <include>changelog.txt</include>
+ <include>seam21migration.txt</include>
+ <include>seam2migration.txt</include>
+ <include>clustering-howto.txt</include>
+ <include>seam</include>
+ <include>seam.bat</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../extras</directory>
+ <outputDirectory>extras</outputDirectory>
+ <includes>
+ <include>mail-ra.rar</include>
+ <include>jsUnit/**</include>
+ <include>readme.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../jboss-seam/target</directory>
+ <outputDirectory>lib/interop</outputDirectory>
+ <includes>
+ <include>jboss-seam-wls-compatible.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../jboss-seam/target</directory>
+ <outputDirectory>lib/interop/src</outputDirectory>
+ <includes>
+ <include>jboss-seam-wls-compatible-sources.jar</include>
+ </includes>
+ </fileSet>
+ <!-- all jars from jboss-seam module dependencies
+ (done this way due needs to have all scopes except test there) -->
+ <fileSet>
+ <directory>../jar-dependencies</directory>
+ <outputDirectory>./lib</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+
+ <!-- some extra things Embedded bootstrap, extras etc. -->
+ <dependencySet>
+ <outputDirectory>.</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>org.jboss.seam:jboss-embedded-bootstrap</include>
+ </includes>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/**</exclude>
+ <exclude>.settings/</exclude>
+ <exclude>**/.settings/</exclude>
+ <exclude>.gitignore</exclude>
+ <exclude>.project</exclude>
+ <exclude>.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.classpath</exclude>
+ </excludes>
+ </unpackOptions>
+ <outputFileNameMapping>${artifact.artifactId}</outputFileNameMapping>
+ </dependencySet>
+
+ <!-- Add necessary sources jars -->
+ <dependencySet>
+ <outputDirectory>lib/src</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>org.jboss.seam:*:*:sources</include>
+ </includes>
+ <excludes>
+ <exclude>org.jboss.seam:jboss-seam-gen:*:sources</exclude>
+ <exclude>org.jboss.seam:jboss-seam-jul:*:sources</exclude>
+ </excludes>
+ <outputFileNameMapping>${artifact.artifactId}-sources.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <!-- Add jboss-seam jars into lib folder -->
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>org.jboss.seam:jboss-seam:ejb</include>
+ <include>org.jboss.seam:jboss-seam-debug:jar</include>
+ <include>org.jboss.seam:jboss-seam-ui:jar</include>
+ <include>org.jboss.seam:jboss-seam-excel:jar</include>
+ <include>org.jboss.seam:jboss-seam-pdf:jar</include>
+ <include>org.jboss.seam:jboss-seam-mail:jar</include>
+ <include>org.jboss.seam:jboss-seam-rss:jar</include>
+ <include>org.jboss.seam:jboss-seam-resteasy:jar</include>
+ <include>org.jboss.seam:jboss-seam-wicket:jar</include>
+ <include>org.jboss.seam:jboss-seam-remoting:jar</include>
+ <include>org.jboss.seam:jboss-seam-flex:jar</include>
+ <include>org.jboss.seam:jboss-seam-ioc:jar</include>
+ <include>org.jboss.seam.embedded:jboss-embedded-api:jar</include>
+ </includes>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <!-- Seam jul -->
+ <dependencySet>
+ <outputDirectory>lib/interop</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>org.jboss.seam:jboss-seam-jul:jar</include>
+ </includes>
+ <excludes>
+ <exclude>org.jboss.seam:jboss-seam-jul:jar:sources</exclude>
+ </excludes>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <!-- Seam jul sources -->
+ <dependencySet>
+ <outputDirectory>lib/interop/src</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>org.jboss.seam:jboss-seam-jul:jar:sources</include>
+ </includes>
+ <outputFileNameMapping>${artifact.artifactId}-sources.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <!-- Seam gen -->
+ <dependencySet>
+ <outputDirectory>lib/gen</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useStrictFiltering>true</useStrictFiltering>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <includes>
+ <include>org.jboss.seam:jboss-seam-gen:jar</include>
+ <include>org.hibernate:hibernate-tools:jar</include>
+ <include>org.beanshell:bsh:jar</include>
+ <include>org.hibernate:jtidy:jar</include>
+ <include>freemarker:freemarker:jar</include>
+ <include>org.eclipse.core:runtime:jar</include>
+ <include>org.eclipse.equinox:common:jar</include>
+ <include>org.eclipse:text:jar</include>
+ <include>org.richfaces.samples:darkX:jar</include>
+ <include>org.richfaces.samples:laguna:jar</include>
+ <include>org.richfaces.samples:glassX:jar</include>
+ <include>org.apache.ant:ant:jar</include>
+ <include>org.apache.ant:ant-launcher:jar</include>
+ <include>org.apache.ant:ant-nodeps:jar</include>
+ </includes>
+ <excludes>
+ <exclude>org.jboss.seam:jboss-seam-gen:jar:sources</exclude>
+ </excludes>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>lib/gen/src</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>org.jboss.seam:jboss-seam-gen:*:sources</include>
+ </includes>
+ <outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>./seam-gen</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>**/.gitignore</exclude>
+ </excludes>
+ </unpackOptions>
+ <includes>
+ <include>org.jboss.seam:jboss-seam-gen:zip:distribution</include>
+ </includes>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>lib/test</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>org.jboss.seam.embedded:hibernate-all:*</include>
+ <include>org.jboss.seam.embedded:jboss-embedded-all:*</include>
+ <include>org.jboss.seam.embedded:thirdparty-all:*</include>
+ </includes>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <!-- Pull in docbook artifacts -->
+ <dependencySet>
+ <outputDirectory>doc/reference/</outputDirectory>
+ <unpack>true</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>org.jboss.seam:seam-reference-guide</include>
+ </includes>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/</exclude>
+ </excludes>
+ </unpackOptions>
+ <outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <!-- Add necessary javadoc jars -->
+ <dependencySet>
+ <outputDirectory>doc/api</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/</exclude>
+ </excludes>
+ </unpackOptions>
+ <includes>
+ <include>org.jboss.seam:jboss-seam:*:javadoc</include>
+ </includes>
+ <outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>doc/ui/apidocs</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/</exclude>
+ </excludes>
+ </unpackOptions>
+ <includes>
+ <include>org.jboss.seam:jboss-seam-ui:*:javadoc</include>
+ </includes>
+ <outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ </dependencySets>
+</assembly>
Copied: branches/community/Seam_2_3/distribution/src/main/assembly/dist-jsf2.xml (from rev 14236, branches/community/Seam_2_3/distribution/src/main/assembly/assembly.xml)
===================================================================
--- branches/community/Seam_2_3/distribution/src/main/assembly/dist-jsf2.xml (rev 0)
+++ branches/community/Seam_2_3/distribution/src/main/assembly/dist-jsf2.xml 2011-10-28 15:33:26 UTC (rev 14237)
@@ -0,0 +1,287 @@
+<assembly
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.2 http://maven.apache.org/xsd/assembly-2.2.xsd">
+
+ <id>distribution-jsf2</id>
+ <formats>
+<!-- <format>dir</format> -->
+ <format>zip</format>
+ <format>tar.gz</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+
+ <!-- Add distribution files -->
+ <fileSets>
+
+ <!-- All module sources defined in dependencies except examples -->
+ <fileSet>
+ <directory>target/dependency</directory>
+ <outputDirectory>src</outputDirectory>
+ <excludes>
+ <exclude>examples/</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- Examples only -->
+ <fileSet>
+ <directory>target/dependency</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>examples/</include>
+ </includes>
+ <excludes>
+ <exclude>examples/wiki/</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- Distribution related files -->
+ <fileSet>
+ <directory>src/main/assembly</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>readme.txt</include>
+ <include>lgpl.txt</include>
+ <include>copyright.txt</include>
+ <include>changelog.txt</include>
+ <include>seam21migration.txt</include>
+ <include>seam2migration.txt</include>
+ <include>clustering-howto.txt</include>
+ <include>seam</include>
+ <include>seam.bat</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../extras</directory>
+ <outputDirectory>extras</outputDirectory>
+ <includes>
+ <include>mail-ra.rar</include>
+ <include>jsUnit/**</include>
+ <include>readme.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../jboss-seam/target</directory>
+ <outputDirectory>lib/interop</outputDirectory>
+ <includes>
+ <include>jboss-seam-wls-compatible.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../jboss-seam/target</directory>
+ <outputDirectory>lib/interop/src</outputDirectory>
+ <includes>
+ <include>jboss-seam-wls-compatible-sources.jar</include>
+ </includes>
+ </fileSet>
+ <!-- all jars from jboss-seam module dependencies
+ (done this way due needs to have all scopes except test there) -->
+ <fileSet>
+ <directory>../jar-dependencies</directory>
+ <outputDirectory>./lib</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+
+ <!-- some extra things Embedded bootstrap, extras etc. -->
+ <dependencySet>
+ <outputDirectory>.</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>org.jboss.seam:jboss-embedded-bootstrap</include>
+ </includes>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/**</exclude>
+ <exclude>.settings/</exclude>
+ <exclude>**/.settings/</exclude>
+ <exclude>.gitignore</exclude>
+ <exclude>.project</exclude>
+ <exclude>.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.classpath</exclude>
+ </excludes>
+ </unpackOptions>
+ <outputFileNameMapping>${artifact.artifactId}</outputFileNameMapping>
+ </dependencySet>
+
+ <!-- Add necessary sources jars -->
+ <dependencySet>
+ <outputDirectory>lib/src</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>org.jboss.seam:*:*:sources</include>
+ </includes>
+ <excludes>
+ <exclude>org.jboss.seam:jboss-seam-gen:*:sources</exclude>
+ <exclude>org.jboss.seam:jboss-seam-jul:*:sources</exclude>
+ </excludes>
+ <outputFileNameMapping>${artifact.artifactId}-sources.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <!-- Add jboss-seam jars into lib folder -->
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>org.jboss.seam:jboss-seam:ejb</include>
+ <include>org.jboss.seam:jboss-seam-debug-jsf2:jar</include>
+ <include>org.jboss.seam:jboss-seam-ui-jsf2:jar</include>
+ <include>org.jboss.seam:jboss-seam-excel:jar</include>
+ <include>org.jboss.seam:jboss-seam-pdf:jar</include>
+ <include>org.jboss.seam:jboss-seam-mail:jar</include>
+ <include>org.jboss.seam:jboss-seam-rss:jar</include>
+ <include>org.jboss.seam:jboss-seam-resteasy:jar</include>
+ <include>org.jboss.seam:jboss-seam-wicket:jar</include>
+ <include>org.jboss.seam:jboss-seam-remoting:jar</include>
+ <include>org.jboss.seam:jboss-seam-flex:jar</include>
+ <include>org.jboss.seam:jboss-seam-ioc:jar</include>
+ <include>org.jboss.seam.embedded:jboss-embedded-api:jar</include>
+ </includes>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <!-- Seam jul -->
+ <dependencySet>
+ <outputDirectory>lib/interop</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>org.jboss.seam:jboss-seam-jul:jar</include>
+ </includes>
+ <excludes>
+ <exclude>org.jboss.seam:jboss-seam-jul:jar:sources</exclude>
+ </excludes>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <!-- Seam jul sources -->
+ <dependencySet>
+ <outputDirectory>lib/interop/src</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>org.jboss.seam:jboss-seam-jul:jar:sources</include>
+ </includes>
+ <outputFileNameMapping>${artifact.artifactId}-sources.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <!-- Seam gen -->
+ <dependencySet>
+ <outputDirectory>lib/gen</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useStrictFiltering>true</useStrictFiltering>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <includes>
+ <include>org.jboss.seam:jboss-seam-gen:jar</include>
+ <include>org.hibernate:hibernate-tools:jar</include>
+ <include>org.beanshell:bsh:jar</include>
+ <include>org.hibernate:jtidy:jar</include>
+ <include>freemarker:freemarker:jar</include>
+ <include>org.eclipse.core:runtime:jar</include>
+ <include>org.eclipse.equinox:common:jar</include>
+ <include>org.eclipse:text:jar</include>
+ <include>org.richfaces.samples:darkX:jar</include>
+ <include>org.richfaces.samples:laguna:jar</include>
+ <include>org.richfaces.samples:glassX:jar</include>
+ <include>org.apache.ant:ant:jar</include>
+ <include>org.apache.ant:ant-launcher:jar</include>
+ <include>org.apache.ant:ant-nodeps:jar</include>
+ </includes>
+ <excludes>
+ <exclude>org.jboss.seam:jboss-seam-gen:jar:sources</exclude>
+ </excludes>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>lib/gen/src</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>org.jboss.seam:jboss-seam-gen:*:sources</include>
+ </includes>
+ <outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>./seam-gen</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>**/.gitignore</exclude>
+ </excludes>
+ </unpackOptions>
+ <includes>
+ <include>org.jboss.seam:jboss-seam-gen:zip:distribution</include>
+ </includes>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>lib/test</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>org.jboss.seam.embedded:hibernate-all:*</include>
+ <include>org.jboss.seam.embedded:jboss-embedded-all:*</include>
+ <include>org.jboss.seam.embedded:thirdparty-all:*</include>
+ </includes>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <!-- Pull in docbook artifacts -->
+ <dependencySet>
+ <outputDirectory>doc/reference/</outputDirectory>
+ <unpack>true</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>org.jboss.seam:seam-reference-guide</include>
+ </includes>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/</exclude>
+ </excludes>
+ </unpackOptions>
+ <outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <!-- Add necessary javadoc jars -->
+ <dependencySet>
+ <outputDirectory>doc/api</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/</exclude>
+ </excludes>
+ </unpackOptions>
+ <includes>
+ <include>org.jboss.seam:jboss-seam:*:javadoc</include>
+ </includes>
+ <outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>doc/ui/apidocs</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/</exclude>
+ </excludes>
+ </unpackOptions>
+ <includes>
+ <include>org.jboss.seam:jboss-seam-ui:*:javadoc</include>
+ </includes>
+ <outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ </dependencySets>
+</assembly>
Modified: branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/com/sun/facelets/StateWriterControl.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/com/sun/facelets/StateWriterControl.java 2011-10-19 21:34:20 UTC (rev 14236)
+++ branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/com/sun/facelets/StateWriterControl.java 2011-10-28 15:33:26 UTC (rev 14237)
@@ -13,13 +13,13 @@
* completely initialized).
*/
public class StateWriterControl {
- final static String STATEWRITER_CLASS_NAME = "com.sun.facelets.StateWriter";
+ final static String STATEWRITER_CLASS_NAME = "com.sun.faces.facelets.StateWriter";
static Class getStateWriter() {
try {
return Class.forName(STATEWRITER_CLASS_NAME);
} catch (Exception e) {
- throw new RuntimeException("Could not load class com.sun.facelets.StateWriter using reflection", e);
+ throw new RuntimeException("Could not load class com.sun.faces.facelets.StateWriter using reflection", e);
}
}
@@ -30,7 +30,7 @@
constructor.setAccessible(true);
constructor.newInstance(writer, 1024);
} catch (Exception e) {
- throw new RuntimeException("Could not initilise com.sun.facelets.StateWriter using reflection", e);
+ throw new RuntimeException("Could not initilise com.sun.faces.facelets.StateWriter using reflection", e);
}
}
@@ -42,7 +42,7 @@
Writer w = (Writer) meth.invoke(null);
return writer.cloneWithWriter(w);
} catch (Exception e) {
- throw new RuntimeException("Could not create clone of com.sun.facelets.StateWriter using reflection", e);
+ throw new RuntimeException("Could not create clone of com.sun.faces.facelets.StateWriter using reflection", e);
}
}
@@ -56,7 +56,7 @@
instMeth.setAccessible(true);
return (Boolean) instMeth.invoke(o);
} catch (Exception e) {
- throw new RuntimeException("Could not call isStateWritten on com.sun.facelets.StateWriter using reflection", e);
+ throw new RuntimeException("Could not call isStateWritten on com.sun.faces.facelets.StateWriter using reflection", e);
}
}
@@ -70,7 +70,7 @@
instMeth.setAccessible(true);
return (String) instMeth.invoke(o);
} catch (Exception e) {
- throw new RuntimeException("Could not call getAndResetBuffer on com.sun.facelets.StateWriter using reflection", e);
+ throw new RuntimeException("Could not call getAndResetBuffer on com.sun.faces.facelets.StateWriter using reflection", e);
}
}
@@ -84,7 +84,7 @@
instMeth.setAccessible(true);
instMeth.invoke(o);
} catch (Exception e) {
- throw new RuntimeException("Could not call release on com.sun.facelets.StateWriter using reflection",e);
+ throw new RuntimeException("Could not call release on com.sun.faces.facelets.StateWriter using reflection",e);
}
}
Modified: branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/org/jboss/seam/debug/Contexts.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/org/jboss/seam/debug/Contexts.java 2011-10-19 21:34:20 UTC (rev 14236)
+++ branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/org/jboss/seam/debug/Contexts.java 2011-10-28 15:33:26 UTC (rev 14237)
@@ -33,14 +33,20 @@
public String[] getSession()
{
- String[] names = org.jboss.seam.contexts.Contexts.getSessionContext().getNames();
+ String[] names={};
+ if(org.jboss.seam.contexts.Contexts.isSessionContextActive()) {
+ names = org.jboss.seam.contexts.Contexts.getSessionContext().getNames();
+ }
Arrays.sort(names);
return names;
}
public String[] getConversation()
{
- String[] names = org.jboss.seam.contexts.Contexts.getConversationContext().getNames();
+ String[] names = {};
+ if ( org.jboss.seam.contexts.Contexts.isConversationContextActive()) {
+ names = org.jboss.seam.contexts.Contexts.getConversationContext().getNames();
+ }
Arrays.sort(names);
return names;
}
@@ -61,7 +67,17 @@
public Exception getException()
{
- return (Exception) org.jboss.seam.contexts.Contexts.getConversationContext().get("org.jboss.seam.caughtException");
+ Exception e=null;
+ if(org.jboss.seam.contexts.Contexts.isConversationContextActive())
+ {
+ if(org.jboss.seam.contexts.Contexts.getConversationContext().get("org.jboss.seam.caughtException")==null) {
+ return null;
+ }
+ else {
+ e=(Exception)org.jboss.seam.contexts.Contexts.getConversationContext().get("org.jboss.seam.caughtException");
+ }
+ }
+ return e;
}
public List<Exception> getExceptionCauses()
Modified: branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/org/jboss/seam/debug/jsf2/SeamDebugPhaseListener.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/org/jboss/seam/debug/jsf2/SeamDebugPhaseListener.java 2011-10-19 21:34:20 UTC (rev 14236)
+++ branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/org/jboss/seam/debug/jsf2/SeamDebugPhaseListener.java 2011-10-28 15:33:26 UTC (rev 14237)
@@ -11,6 +11,7 @@
import javax.faces.event.PhaseEvent;
import javax.faces.event.PhaseId;
import javax.faces.event.PhaseListener;
+import javax.faces.view.facelets.ResourceResolver;
import javax.servlet.http.HttpServletResponse;
import org.jboss.seam.contexts.FacesLifecycle;
@@ -42,7 +43,16 @@
{
FacesContext facesContext = FacesContext.getCurrentInstance();
URL url = SeamDebugPhaseListener.class.getClassLoader().getResource("META-INF/debug.xhtml");
- Facelet f = new DefaultFaceletFactory( new SAXCompiler(), new DefaultResourceResolver() ).getFacelet(url);
+
+ ResourceResolver resroler=new ResourceResolver(){
+ @Override
+ public URL resolveUrl(String path)
+ {
+ return SeamDebugPhaseListener.class.getClassLoader().getResource(path);
+ }
+ };
+
+ Facelet f = new DefaultFaceletFactory( new SAXCompiler(),resroler).getFacelet(url);
UIViewRoot viewRoot = facesContext.getViewRoot();
f.apply(facesContext, viewRoot);
HttpServletResponse response = (HttpServletResponse) facesContext.getExternalContext().getResponse();
Modified: branches/community/Seam_2_3/jboss-seam-mail/src/main/java/org/jboss/seam/mail/ui/context/MailFacesContextImpl.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-mail/src/main/java/org/jboss/seam/mail/ui/context/MailFacesContextImpl.java 2011-10-19 21:34:20 UTC (rev 14236)
+++ branches/community/Seam_2_3/jboss-seam-mail/src/main/java/org/jboss/seam/mail/ui/context/MailFacesContextImpl.java 2011-10-28 15:33:26 UTC (rev 14237)
@@ -1,5 +1,6 @@
package org.jboss.seam.mail.ui.context;
+import javax.el.ELContext;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
@@ -33,6 +34,13 @@
}
@Override
+ public ELContext getELContext()
+ {
+
+ return getDelegate().getELContext();
+
+ }
+ @Override
public ResponseWriter getResponseWriter()
{
return responseWriter;
Modified: branches/community/Seam_2_3/jboss-seam-parent/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2011-10-19 21:34:20 UTC (rev 14236)
+++ branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2011-10-28 15:33:26 UTC (rev 14237)
@@ -128,12 +128,30 @@
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-ui-jsf2</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-debug</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-debug-jsf2</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
13 years, 2 months
[seam/social] b02351: Added meta annotation @ServiceRelated and Qualifie...
by noreply@github.com
Branch: refs/heads/develop
Home: https://github.com/seam/social
Commit: b023512c80b2cb11a78df47ebfc9afb24adec915
https://github.com/seam/social/commit/b023512c80b2cb11a78df47ebfc9afb24ad...
Author: Antoine Sabot-Durand <antoine(a)sabot-durand.net>
Date: 2011-10-27 (Thu, 27 Oct 2011)
Changed paths:
A api/src/main/java/org/jboss/seam/social/RelatedTo.java
A api/src/main/java/org/jboss/seam/social/ServiceRelated.java
R api/src/main/java/org/jboss/seam/social/cdi/RelatedTo.java
M impl/src/main/java/org/jboss/seam/social/MultiServicesManagerImpl.java
M impl/src/main/java/org/jboss/seam/social/OAuthServiceBase.java
M impl/src/main/java/org/jboss/seam/social/OAuthServiceSettingsImpl.java
M impl/src/main/java/org/jboss/seam/social/SeamSocialExtension.java
M services/facebook/src/main/java/org/jboss/seam/social/facebook/Facebook.java
A services/facebook/src/main/java/org/jboss/seam/social/facebook/FacebookService.java
R services/facebook/src/main/java/org/jboss/seam/social/facebook/jackson/FacebookJackson.java
M services/facebook/src/main/java/org/jboss/seam/social/facebook/jackson/FacebookProducer.java
A services/facebook/src/main/java/org/jboss/seam/social/facebook/jackson/FacebookServiceJackson.java
M services/linkedin/src/main/java/org/jboss/seam/social/linkedin/LinkedIn.java
A services/linkedin/src/main/java/org/jboss/seam/social/linkedin/LinkedInService.java
R services/linkedin/src/main/java/org/jboss/seam/social/linkedin/jackson/LinkedInJackson.java
M services/linkedin/src/main/java/org/jboss/seam/social/linkedin/jackson/LinkedInProducer.java
A services/linkedin/src/main/java/org/jboss/seam/social/linkedin/jackson/LinkedInServiceJackson.java
M services/twitter/src/main/java/org/jboss/seam/social/twitter/Twitter.java
A services/twitter/src/main/java/org/jboss/seam/social/twitter/TwitterService.java
R services/twitter/src/main/java/org/jboss/seam/social/twitter/jackson/TwitterJackson.java
M services/twitter/src/main/java/org/jboss/seam/social/twitter/jackson/TwitterProducer.java
A services/twitter/src/main/java/org/jboss/seam/social/twitter/jackson/TwitterServiceJackson.java
M services/twitter/src/main/java/org/jboss/seam/social/twitter/model/SearchResult.java
M services/twitter/src/main/java/org/jboss/seam/social/twitter/package-info.java
M services/twitter/src/test/java/org/jboss/seam/social/twitter/test/TwitterTest.java
Log Message:
-----------
Added meta annotation @ServiceRelated and Qualifiers for each Social
services.
Deprecated @RelatedTo qualifier and having the extension building a set
of qualifiers annotated with @ServiceRelated
Commit: e2ddba66a709647fb8e3dff1cbd4f333a794e7b4
https://github.com/seam/social/commit/e2ddba66a709647fb8e3dff1cbd4f333a79...
Author: Antoine Sabot-Durand <antoine(a)sabot-durand.net>
Date: 2011-10-27 (Thu, 27 Oct 2011)
Changed paths:
M examples/web-client/src/main/resources/META-INF/seam-beans.xml
M impl/src/main/java/org/jboss/seam/social/SeamSocialExtension.java
R services/facebook/src/main/java/org/jboss/seam/social/facebook/jackson/FacebookProducer.java
A services/facebook/src/main/java/org/jboss/seam/social/facebook/jackson/FacebookServiceProducer.java
A services/facebook/src/main/resources/org/jboss/seam/social/facebook/Facebook.properties
M services/linkedin/src/main/java/org/jboss/seam/social/linkedin/LinkedIn.java
A services/linkedin/src/main/java/org/jboss/seam/social/linkedin/LinkedInServiceProducer.java
R services/linkedin/src/main/java/org/jboss/seam/social/linkedin/jackson/LinkedInProducer.java
A services/linkedin/src/main/resources/org/jboss/seam/social/linkedin/LinkedIn.properties
A services/twitter/src/main/java/org/jboss/seam/social/twitter/TwitterServiceProducer.java
R services/twitter/src/main/java/org/jboss/seam/social/twitter/jackson/TwitterProducer.java
A services/twitter/src/main/resources/org/jboss/seam/social/twitter/Twitter.properties
Log Message:
-----------
Building association between name of Services and Qualifier
Commit: d95ee3d77119ec623d4e51e9620819e5af004ced
https://github.com/seam/social/commit/d95ee3d77119ec623d4e51e9620819e5af0...
Author: Antoine Sabot-Durand <antoine(a)sabot-durand.net>
Date: 2011-10-27 (Thu, 27 Oct 2011)
Changed paths:
R api/src/main/java/org/jboss/seam/social/RelatedTo.java
M api/src/main/java/org/jboss/seam/social/oauth/OAuthService.java
M examples/web-client/src/main/resources/META-INF/seam-beans.xml
M impl/src/main/java/org/jboss/seam/social/MultiServicesManagerImpl.java
M impl/src/main/java/org/jboss/seam/social/OAuthServiceBase.java
M impl/src/main/java/org/jboss/seam/social/OAuthServiceSettingsImpl.java
M impl/src/main/java/org/jboss/seam/social/SeamSocialExtension.java
A services/facebook/src/main/java/org/jboss/seam/social/Facebook.java
R services/facebook/src/main/java/org/jboss/seam/social/facebook/Facebook.java
M services/facebook/src/main/java/org/jboss/seam/social/facebook/FacebookService.java
A services/facebook/src/main/java/org/jboss/seam/social/facebook/FacebookServiceProducer.java
M services/facebook/src/main/java/org/jboss/seam/social/facebook/jackson/FacebookServiceJackson.java
R services/facebook/src/main/java/org/jboss/seam/social/facebook/jackson/FacebookServiceProducer.java
A services/facebook/src/main/resources/org/jboss/seam/social/Facebook.properties
R services/facebook/src/main/resources/org/jboss/seam/social/facebook/Facebook.properties
A services/linkedin/src/main/java/org/jboss/seam/social/LinkedIn.java
R services/linkedin/src/main/java/org/jboss/seam/social/linkedin/LinkedIn.java
M services/linkedin/src/main/java/org/jboss/seam/social/linkedin/LinkedInService.java
M services/linkedin/src/main/java/org/jboss/seam/social/linkedin/LinkedInServiceProducer.java
M services/linkedin/src/main/java/org/jboss/seam/social/linkedin/jackson/LinkedInServiceJackson.java
A services/linkedin/src/main/resources/org/jboss/seam/social/LinkedIn.properties
R services/linkedin/src/main/resources/org/jboss/seam/social/linkedin/LinkedIn.properties
M services/twitter/pom.xml
A services/twitter/src/main/java/org/jboss/seam/social/Twitter.java
R services/twitter/src/main/java/org/jboss/seam/social/twitter/Twitter.java
M services/twitter/src/main/java/org/jboss/seam/social/twitter/TwitterService.java
M services/twitter/src/main/java/org/jboss/seam/social/twitter/TwitterServiceProducer.java
M services/twitter/src/main/java/org/jboss/seam/social/twitter/jackson/TwitterServiceJackson.java
A services/twitter/src/main/resources/org/jboss/seam/social/Twitter.properties
R services/twitter/src/main/resources/org/jboss/seam/social/twitter/Twitter.properties
Log Message:
-----------
Ended refactoring for a stronger typed Quqlifier system on Services
Commit: 4c0c4440b0872244d935fc4f9ffa04e91474866e
https://github.com/seam/social/commit/4c0c4440b0872244d935fc4f9ffa04e9147...
Author: Antoine Sabot-Durand <antoine(a)sabot-durand.net>
Date: 2011-10-27 (Thu, 27 Oct 2011)
Changed paths:
M readme.md
Log Message:
-----------
Updating Readme file with the new qualifier system
Commit: 5797b214771458a6a7ca16390c8d2786d05a3930
https://github.com/seam/social/commit/5797b214771458a6a7ca16390c8d2786d05...
Author: Antoine Sabot-Durand <antoine(a)sabot-durand.net>
Date: 2011-10-27 (Thu, 27 Oct 2011)
Changed paths:
M services/twitter/src/test/java/org/jboss/seam/social/twitter/test/TwitterTest.java
Log Message:
-----------
Cleaning Import in TwitterTest
Compare: https://github.com/seam/social/compare/780d54f...5797b21
13 years, 2 months
[seam/social] bfaebe: Convert to the new testsuite structure
by noreply@github.com
Branch: refs/heads/develop
Home: https://github.com/seam/social
Commit: bfaebe767e412877801ba0158b9f6cd3b208670f
https://github.com/seam/social/commit/bfaebe767e412877801ba0158b9f6cd3b20...
Author: Marek Schmidt <maschmid(a)redhat.com>
Date: 2011-10-27 (Thu, 27 Oct 2011)
Changed paths:
M api/pom.xml
M impl/pom.xml
R impl/src/test/java/org/jboss/seam/social/test/MultiServicesManagerImplTest.java
M pom.xml
M services/twitter/pom.xml
M services/twitter/src/test/java/org/jboss/seam/social/twitter/test/TwitterTest.java
R services/twitter/src/test/resources-jbossas/jndi.properties
M services/twitter/src/test/resources/arquillian.xml
A testsuite/pom.xml
A testsuite/readme.md
A testsuite/src/test/java/org/jboss/seam/social/test/Deployments.java
A testsuite/src/test/java/org/jboss/seam/social/test/MultiServicesManagerImplTest.java
A testsuite/src/test/resources/arquillian.xml
Log Message:
-----------
Convert to the new testsuite structure
Commit: 780d54f9fc50082c46bffc6706922502b8de7f26
https://github.com/seam/social/commit/780d54f9fc50082c46bffc6706922502b8d...
Author: Antoine Sabot-Durand <antoine(a)sabot-durand.net>
Date: 2011-10-27 (Thu, 27 Oct 2011)
Changed paths:
M api/pom.xml
M impl/pom.xml
R impl/src/test/java/org/jboss/seam/social/test/MultiServicesManagerImplTest.java
M pom.xml
M services/twitter/pom.xml
M services/twitter/src/test/java/org/jboss/seam/social/twitter/test/TwitterTest.java
R services/twitter/src/test/resources-jbossas/jndi.properties
M services/twitter/src/test/resources/arquillian.xml
A testsuite/pom.xml
A testsuite/readme.md
A testsuite/src/test/java/org/jboss/seam/social/test/Deployments.java
A testsuite/src/test/java/org/jboss/seam/social/test/MultiServicesManagerImplTest.java
A testsuite/src/test/resources/arquillian.xml
Log Message:
-----------
Merge pull request #10 from maschmid/SEAMSOCIAL-23
SEAMSOCIAL-23 Convert to the new testsuite structure
Compare: https://github.com/seam/social/compare/4e22ffc...780d54f
13 years, 2 months