Seam SVN: r12933 - modules/jms/trunk/dist.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-06-02 06:42:54 -0400 (Wed, 02 Jun 2010)
New Revision: 12933
Modified:
modules/jms/trunk/dist/pom.xml
Log:
mark provided
Modified: modules/jms/trunk/dist/pom.xml
===================================================================
--- modules/jms/trunk/dist/pom.xml 2010-06-02 10:36:45 UTC (rev 12932)
+++ modules/jms/trunk/dist/pom.xml 2010-06-02 10:42:54 UTC (rev 12933)
@@ -42,6 +42,7 @@
<groupId>org.jboss.seam.jms</groupId>
…
[View More] <artifactId>seam-jms-api</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -49,6 +50,7 @@
<artifactId>seam-jms-api</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -56,12 +58,14 @@
<artifactId>seam-jms-api</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.seam.jms</groupId>
<artifactId>seam-jms</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -69,6 +73,7 @@
<artifactId>seam-jms</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -76,13 +81,15 @@
<artifactId>seam-jms</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.seam.jms</groupId>
<artifactId>seam-jms-reference-guide</artifactId>
<version>${project.version}</version>
- <type>war</type>
+ <type>war</type>
+ <scope>provided</scope>
</dependency>
</dependencies>
[View Less]
14 years, 9 months
Seam SVN: r12932 - modules/jms/trunk/docs/reference/src/main/docbook/en-US.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-06-02 06:36:45 -0400 (Wed, 02 Jun 2010)
New Revision: 12932
Modified:
modules/jms/trunk/docs/reference/src/main/docbook/en-US/author_group.xml
modules/jms/trunk/docs/reference/src/main/docbook/en-US/book_info.xml
modules/jms/trunk/docs/reference/src/main/docbook/en-US/installation.xml
modules/jms/trunk/docs/reference/src/main/docbook/en-US/intro.xml
modules/jms/trunk/docs/reference/src/main/docbook/en-US/master.xml
modules/jms/trunk/…
[View More]docs/reference/src/main/docbook/en-US/resource-injection.xml
modules/jms/trunk/docs/reference/src/main/docbook/en-US/routing.xml
Log:
update docbook dtd version
Modified: modules/jms/trunk/docs/reference/src/main/docbook/en-US/author_group.xml
===================================================================
--- modules/jms/trunk/docs/reference/src/main/docbook/en-US/author_group.xml 2010-06-02 10:26:59 UTC (rev 12931)
+++ modules/jms/trunk/docs/reference/src/main/docbook/en-US/author_group.xml 2010-06-02 10:36:45 UTC (rev 12932)
@@ -20,8 +20,8 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
+<!DOCTYPE authorgroup PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" []>
<authorgroup>
<author>
<firstname>Jordan</firstname>
Modified: modules/jms/trunk/docs/reference/src/main/docbook/en-US/book_info.xml
===================================================================
--- modules/jms/trunk/docs/reference/src/main/docbook/en-US/book_info.xml 2010-06-02 10:26:59 UTC (rev 12931)
+++ modules/jms/trunk/docs/reference/src/main/docbook/en-US/book_info.xml 2010-06-02 10:36:45 UTC (rev 12932)
@@ -20,8 +20,8 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
+<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" []>
<bookinfo>
<title>JBoss Seam 3 JMS Module</title>
Modified: modules/jms/trunk/docs/reference/src/main/docbook/en-US/installation.xml
===================================================================
--- modules/jms/trunk/docs/reference/src/main/docbook/en-US/installation.xml 2010-06-02 10:26:59 UTC (rev 12931)
+++ modules/jms/trunk/docs/reference/src/main/docbook/en-US/installation.xml 2010-06-02 10:36:45 UTC (rev 12932)
@@ -20,8 +20,8 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" []>
<chapter id="installation">
<title>Installation</title>
Modified: modules/jms/trunk/docs/reference/src/main/docbook/en-US/intro.xml
===================================================================
--- modules/jms/trunk/docs/reference/src/main/docbook/en-US/intro.xml 2010-06-02 10:26:59 UTC (rev 12931)
+++ modules/jms/trunk/docs/reference/src/main/docbook/en-US/intro.xml 2010-06-02 10:36:45 UTC (rev 12932)
@@ -20,8 +20,8 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" []>
<chapter id="intro">
<title>Introduction</title>
Modified: modules/jms/trunk/docs/reference/src/main/docbook/en-US/master.xml
===================================================================
--- modules/jms/trunk/docs/reference/src/main/docbook/en-US/master.xml 2010-06-02 10:26:59 UTC (rev 12931)
+++ modules/jms/trunk/docs/reference/src/main/docbook/en-US/master.xml 2010-06-02 10:36:45 UTC (rev 12932)
@@ -20,8 +20,8 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" []>
<book lang="en">
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="book_info.xml" />
<toc />
Modified: modules/jms/trunk/docs/reference/src/main/docbook/en-US/resource-injection.xml
===================================================================
--- modules/jms/trunk/docs/reference/src/main/docbook/en-US/resource-injection.xml 2010-06-02 10:26:59 UTC (rev 12931)
+++ modules/jms/trunk/docs/reference/src/main/docbook/en-US/resource-injection.xml 2010-06-02 10:36:45 UTC (rev 12932)
@@ -20,8 +20,8 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" []>
<chapter id="resource-injection">
<title>Resource Injection</title>
Modified: modules/jms/trunk/docs/reference/src/main/docbook/en-US/routing.xml
===================================================================
--- modules/jms/trunk/docs/reference/src/main/docbook/en-US/routing.xml 2010-06-02 10:26:59 UTC (rev 12931)
+++ modules/jms/trunk/docs/reference/src/main/docbook/en-US/routing.xml 2010-06-02 10:36:45 UTC (rev 12932)
@@ -20,8 +20,8 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" []>
<chapter id="routing">
<title>Bridging the Gap</title>
[View Less]
14 years, 9 months
Seam SVN: r12931 - modules/faces/trunk/docs/reference/src/main/docbook/en-US.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-06-02 06:26:59 -0400 (Wed, 02 Jun 2010)
New Revision: 12931
Modified:
modules/faces/trunk/docs/reference/src/main/docbook/en-US/artifacts.xml
modules/faces/trunk/docs/reference/src/main/docbook/en-US/author_group.xml
modules/faces/trunk/docs/reference/src/main/docbook/en-US/book_info.xml
modules/faces/trunk/docs/reference/src/main/docbook/en-US/components.xml
modules/faces/trunk/docs/reference/src/main/docbook/en-US/events.xml
modules/…
[View More]faces/trunk/docs/reference/src/main/docbook/en-US/installation.xml
modules/faces/trunk/docs/reference/src/main/docbook/en-US/master.xml
modules/faces/trunk/docs/reference/src/main/docbook/en-US/preface.xml
modules/faces/trunk/docs/reference/src/main/docbook/en-US/scopes.xml
Log:
update docbook dtd version
Modified: modules/faces/trunk/docs/reference/src/main/docbook/en-US/artifacts.xml
===================================================================
--- modules/faces/trunk/docs/reference/src/main/docbook/en-US/artifacts.xml 2010-06-02 01:50:49 UTC (rev 12930)
+++ modules/faces/trunk/docs/reference/src/main/docbook/en-US/artifacts.xml 2010-06-02 10:26:59 UTC (rev 12931)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" []>
<chapter id="artifacts">
<title>Faces Artifact Injection</title>
<para>
Modified: modules/faces/trunk/docs/reference/src/main/docbook/en-US/author_group.xml
===================================================================
--- modules/faces/trunk/docs/reference/src/main/docbook/en-US/author_group.xml 2010-06-02 01:50:49 UTC (rev 12930)
+++ modules/faces/trunk/docs/reference/src/main/docbook/en-US/author_group.xml 2010-06-02 10:26:59 UTC (rev 12931)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
+<!DOCTYPE authorgroup PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" []>
<authorgroup>
<author>
<firstname>Dan</firstname>
Modified: modules/faces/trunk/docs/reference/src/main/docbook/en-US/book_info.xml
===================================================================
--- modules/faces/trunk/docs/reference/src/main/docbook/en-US/book_info.xml 2010-06-02 01:50:49 UTC (rev 12930)
+++ modules/faces/trunk/docs/reference/src/main/docbook/en-US/book_info.xml 2010-06-02 10:26:59 UTC (rev 12931)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
+<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" []>
<bookinfo>
<title>Seam Faces Module</title>
Modified: modules/faces/trunk/docs/reference/src/main/docbook/en-US/components.xml
===================================================================
--- modules/faces/trunk/docs/reference/src/main/docbook/en-US/components.xml 2010-06-02 01:50:49 UTC (rev 12930)
+++ modules/faces/trunk/docs/reference/src/main/docbook/en-US/components.xml 2010-06-02 10:26:59 UTC (rev 12931)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" []>
<chapter id="components">
<title>Seam Faces Components</title>
<para>
Modified: modules/faces/trunk/docs/reference/src/main/docbook/en-US/events.xml
===================================================================
--- modules/faces/trunk/docs/reference/src/main/docbook/en-US/events.xml 2010-06-02 01:50:49 UTC (rev 12930)
+++ modules/faces/trunk/docs/reference/src/main/docbook/en-US/events.xml 2010-06-02 10:26:59 UTC (rev 12931)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" []>
<chapter id="events">
<title>Faces Events Propagation</title>
<para>
Modified: modules/faces/trunk/docs/reference/src/main/docbook/en-US/installation.xml
===================================================================
--- modules/faces/trunk/docs/reference/src/main/docbook/en-US/installation.xml 2010-06-02 01:50:49 UTC (rev 12930)
+++ modules/faces/trunk/docs/reference/src/main/docbook/en-US/installation.xml 2010-06-02 10:26:59 UTC (rev 12931)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" []>
<chapter id="installation">
<title>Installation</title>
<para>
Modified: modules/faces/trunk/docs/reference/src/main/docbook/en-US/master.xml
===================================================================
--- modules/faces/trunk/docs/reference/src/main/docbook/en-US/master.xml 2010-06-02 01:50:49 UTC (rev 12930)
+++ modules/faces/trunk/docs/reference/src/main/docbook/en-US/master.xml 2010-06-02 10:26:59 UTC (rev 12931)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" []>
<book lang="en">
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="book_info.xml" />
Modified: modules/faces/trunk/docs/reference/src/main/docbook/en-US/preface.xml
===================================================================
--- modules/faces/trunk/docs/reference/src/main/docbook/en-US/preface.xml 2010-06-02 01:50:49 UTC (rev 12930)
+++ modules/faces/trunk/docs/reference/src/main/docbook/en-US/preface.xml 2010-06-02 10:26:59 UTC (rev 12931)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
+<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" []>
<preface>
<title>Introduction</title>
<para>
Modified: modules/faces/trunk/docs/reference/src/main/docbook/en-US/scopes.xml
===================================================================
--- modules/faces/trunk/docs/reference/src/main/docbook/en-US/scopes.xml 2010-06-02 01:50:49 UTC (rev 12930)
+++ modules/faces/trunk/docs/reference/src/main/docbook/en-US/scopes.xml 2010-06-02 10:26:59 UTC (rev 12931)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" []>
<chapter id="scopes">
<title>Faces Scoping Support</title>
<para>
[View Less]
14 years, 9 months
Seam SVN: r12930 - modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/bridge.
by seam-commits@lists.jboss.org
Author: jganoff
Date: 2010-06-01 21:50:49 -0400 (Tue, 01 Jun 2010)
New Revision: 12930
Modified:
modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/bridge/RouteImpl.java
Log:
minor clean up
Modified: modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/bridge/RouteImpl.java
===================================================================
--- modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/bridge/RouteImpl.java 2010-06-01 21:38:07 UTC (rev 12929)
+++ modules/jms/trunk/…
[View More]impl/src/main/java/org/jboss/seam/jms/bridge/RouteImpl.java 2010-06-02 01:50:49 UTC (rev 12930)
@@ -71,7 +71,7 @@
{
destinations.add(Destination.class.cast(destination));
return this;
- };
+ }
public RouteType getType()
{
[View Less]
14 years, 9 months
Seam SVN: r12929 - in modules/security/trunk/impl/src/main/java/org/jboss/seam/security: management and 1 other directories.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-06-01 17:38:07 -0400 (Tue, 01 Jun 2010)
New Revision: 12929
Modified:
modules/security/trunk/impl/src/main/java/org/jboss/seam/security/JpaTokenStore.java
modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/JpaIdentityStore.java
modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/JpaPermissionStore.java
Log:
minor improvements to compilation issues
Modified: modules/security/trunk/impl/src/main/…
[View More]java/org/jboss/seam/security/JpaTokenStore.java
===================================================================
--- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/JpaTokenStore.java 2010-06-01 19:18:10 UTC (rev 12928)
+++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/JpaTokenStore.java 2010-06-01 21:38:07 UTC (rev 12929)
@@ -3,9 +3,9 @@
import java.io.Serializable;
import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
import javax.enterprise.inject.Instance;
import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
import javax.persistence.Query;
@@ -13,7 +13,7 @@
import org.jboss.seam.security.annotations.TokenUsername;
import org.jboss.seam.security.annotations.TokenValue;
import org.jboss.seam.security.management.IdentityManagementException;
-import org.jboss.seam.security.util.AnnotatedBeanProperty;
+import org.jboss.weld.extensions.util.properties.AnnotatedBeanProperty;
/**
* A TokenStore implementation, stores tokens inside a database table.
Modified: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/JpaIdentityStore.java
===================================================================
--- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/JpaIdentityStore.java 2010-06-01 19:18:10 UTC (rev 12928)
+++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/JpaIdentityStore.java 2010-06-01 21:38:07 UTC (rev 12929)
@@ -13,9 +13,8 @@
import org.jboss.seam.security.annotations.management.IdentityProperty;
import org.jboss.seam.security.annotations.management.PropertyType;
-import org.jboss.weld.extensions.util.AbstractBeanProperty;
-import org.jboss.weld.extensions.util.AnnotatedBeanProperty;
-import org.jboss.weld.extensions.util.TypedBeanProperty;
+import org.jboss.weld.extensions.util.properties.AnnotatedBeanProperty;
+import org.jboss.weld.extensions.util.properties.TypedBeanProperty;
import org.picketlink.idm.api.Credential;
import org.picketlink.idm.api.Group;
import org.picketlink.idm.api.IdentityType;
Modified: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/JpaPermissionStore.java
===================================================================
--- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/JpaPermissionStore.java 2010-06-01 19:18:10 UTC (rev 12928)
+++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/JpaPermissionStore.java 2010-06-01 21:38:07 UTC (rev 12929)
@@ -23,9 +23,8 @@
import org.jboss.seam.security.annotations.permission.PermissionRole;
import org.jboss.seam.security.annotations.permission.PermissionTarget;
import org.jboss.seam.security.management.IdentityManager;
-//import org.jboss.seam.security.management.JpaIdentityStore;
import org.jboss.seam.security.permission.PermissionMetadata.ActionSet;
-import org.jboss.weld.extensions.util.AnnotatedBeanProperty;
+import org.jboss.weld.extensions.util.properties.AnnotatedBeanProperty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
[View Less]
14 years, 9 months
Seam SVN: r12928 - in modules/xml/trunk/docs: src/main and 1 other directories.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-06-01 15:18:10 -0400 (Tue, 01 Jun 2010)
New Revision: 12928
Added:
modules/xml/trunk/docs/src/main/docbook/
modules/xml/trunk/docs/src/main/docbook/en-US/
Removed:
modules/xml/trunk/docs/en-US/
Modified:
modules/xml/trunk/docs/pom.xml
Log:
standard location for docbook src
Modified: modules/xml/trunk/docs/pom.xml
===================================================================
--- modules/xml/trunk/docs/pom.xml 2010-06-01 18:36:37 UTC (…
[View More]rev 12927)
+++ modules/xml/trunk/docs/pom.xml 2010-06-01 19:18:10 UTC (rev 12928)
@@ -2,9 +2,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-parent</artifactId>
- <version>9</version>
+ <groupId>org.jboss.seam.xml</groupId>
+ <artifactId>seam-xml-config-parent</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.jboss.seam.xml</groupId>
@@ -12,21 +13,6 @@
<version>3.0.0-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>Seam XML Config Reference Guide</name>
-
- <pluginRepositories>
- <pluginRepository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <url>http://repository.jboss.org/maven2</url>
- </pluginRepository>
- </pluginRepositories>
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <url>http://repository.jboss.org/maven2</url>
- </repository>
- </repositories>
<properties>
<pdf.name>xml-reference.pdf</pdf.name>
Copied: modules/xml/trunk/docs/src/main/docbook/en-US (from rev 12916, modules/xml/trunk/docs/en-US)
[View Less]
14 years, 9 months
Seam SVN: r12927 - modules/jms/trunk/api.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-06-01 14:36:37 -0400 (Tue, 01 Jun 2010)
New Revision: 12927
Modified:
modules/jms/trunk/api/pom.xml
Log:
remove uncessary profile
Modified: modules/jms/trunk/api/pom.xml
===================================================================
--- modules/jms/trunk/api/pom.xml 2010-06-01 18:34:25 UTC (rev 12926)
+++ modules/jms/trunk/api/pom.xml 2010-06-01 18:36:37 UTC (rev 12927)
@@ -47,31 +47,4 @@
</dependency>
</dependencies>
…
[View More]
- <profiles>
- <profile>
- <id>javadoc</id>
- <activation>
- <property>
- <name>dist</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>javadoc-api</id>
- <phase>package</phase>
- <goals>
- <goal>javadoc</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
[View Less]
14 years, 9 months
Seam SVN: r12926 - in modules/faces/trunk: dist and 4 other directories.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-06-01 14:34:25 -0400 (Tue, 01 Jun 2010)
New Revision: 12926
Added:
modules/faces/trunk/examples/short-ly/src/main/assembly/
modules/faces/trunk/examples/short-ly/src/main/assembly/assembly.xml
Modified:
modules/faces/trunk/dist/
modules/faces/trunk/dist/pom.xml
modules/faces/trunk/dist/src/main/assembly/assembly.xml
modules/faces/trunk/examples/short-ly/pom.xml
modules/faces/trunk/examples/short-ly/readme.txt
modules/faces/trunk/…
[View More]pom.xml
Log:
add examples to dist
Property changes on: modules/faces/trunk/dist
___________________________________________________________________
Name: svn:ignore
- .settings
.project
+ .settings
.project
target
Modified: modules/faces/trunk/dist/pom.xml
===================================================================
--- modules/faces/trunk/dist/pom.xml 2010-06-01 18:29:39 UTC (rev 12925)
+++ modules/faces/trunk/dist/pom.xml 2010-06-01 18:34:25 UTC (rev 12926)
@@ -14,7 +14,7 @@
<name>Seam Faces Distribution</name>
<description>Builds a Seam Faces release distribution</description>
<packaging>pom</packaging>
-
+
<!-- TODO Remove -->
<!-- Snapshots repo to get parent -->
<repositories>
@@ -43,14 +43,14 @@
<artifactId>seam-faces-api</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.jboss.seam.faces</groupId>
<artifactId>seam-faces-api</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
-
+
<dependency>
<groupId>org.jboss.seam.faces</groupId>
<artifactId>seam-faces-api</artifactId>
@@ -63,14 +63,14 @@
<artifactId>seam-faces</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.jboss.seam.faces</groupId>
<artifactId>seam-faces</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
-
+
<dependency>
<groupId>org.jboss.seam.faces</groupId>
<artifactId>seam-faces</artifactId>
@@ -85,6 +85,13 @@
<type>war</type>
</dependency>
+ <dependency>
+ <groupId>org.jboss.seam.faces</groupId>
+ <artifactId>seam-faces-examples-short-ly</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+
</dependencies>
<build>
Modified: modules/faces/trunk/dist/src/main/assembly/assembly.xml
===================================================================
--- modules/faces/trunk/dist/src/main/assembly/assembly.xml 2010-06-01 18:29:39 UTC (rev 12925)
+++ modules/faces/trunk/dist/src/main/assembly/assembly.xml 2010-06-01 18:34:25 UTC (rev 12926)
@@ -2,7 +2,6 @@
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
- <!--<id>distribution</id>-->
<formats>
<format>zip</format>
@@ -52,6 +51,15 @@
<include>org.jboss.seam.faces:seam-faces-api:jar:javadoc</include>
</includes>
</dependencySet>
+ <!-- Pull in the example projects -->
+ <dependencySet>
+ <outputDirectory>examples</outputDirectory>
+ <unpack>true</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>org.jboss.seam.faces:seam-faces-examples-short-ly</include>
+ </includes>
+ </dependencySet>
<!-- Pull in docbook artifacts -->
<dependencySet>
<outputDirectory>doc/reference</outputDirectory>
Modified: modules/faces/trunk/examples/short-ly/pom.xml
===================================================================
--- modules/faces/trunk/examples/short-ly/pom.xml 2010-06-01 18:29:39 UTC (rev 12925)
+++ modules/faces/trunk/examples/short-ly/pom.xml 2010-06-01 18:34:25 UTC (rev 12926)
@@ -96,10 +96,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.glassfish</groupId>
- <artifactId>maven-embedded-glassfish-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
@@ -107,8 +103,27 @@
<target>1.6</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ </plugin>
</plugins>
<finalName>short.ly</finalName>
</build>
+ <profiles>
+ <profile>
+ <id>glassfish</id>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.glassfish</groupId>
+ <artifactId>maven-embedded-glassfish-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
Modified: modules/faces/trunk/examples/short-ly/readme.txt
===================================================================
--- modules/faces/trunk/examples/short-ly/readme.txt 2010-06-01 18:29:39 UTC (rev 12925)
+++ modules/faces/trunk/examples/short-ly/readme.txt 2010-06-01 18:34:25 UTC (rev 12926)
@@ -3,4 +3,8 @@
- Step by Step setup for the example -
- Step by Step execution of the example - "ant deploy" or "mvn clean install" or "run -c server1" + "run -c server2" or "using your browser hit: http://localhost:8080/MyNewApp"
- Expected results - you should see "Hello World" on the console or you can now navigate the web-based application
- - the readme.txt should include the maintainer of the example (along with contact info). This may simply point to the examples' POM.
\ No newline at end of file
+ - the readme.txt should include the maintainer of the example (along with contact info). This may simply point to the examples' POM.
+
+ ----
+
+ To run the example on GlassFish Embedded, type mvn -Pglassfish
\ No newline at end of file
Added: modules/faces/trunk/examples/short-ly/src/main/assembly/assembly.xml
===================================================================
--- modules/faces/trunk/examples/short-ly/src/main/assembly/assembly.xml (rev 0)
+++ modules/faces/trunk/examples/short-ly/src/main/assembly/assembly.xml 2010-06-01 18:34:25 UTC (rev 12926)
@@ -0,0 +1,22 @@
+<assembly
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <formats>
+ <format>zip</format>
+ </formats>
+ <baseDirectory>${project.build.finalName}</baseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}</directory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <excludes>
+ <exclude>${project.build.directory}/**</exclude>
+ <exclude>.classpath</exclude>
+ <exclude>.project</exclude>
+ <exclude>.settings/**</exclude>
+ <exclude>gfembed*/**</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</assembly>
Property changes on: modules/faces/trunk/examples/short-ly/src/main/assembly/assembly.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: modules/faces/trunk/pom.xml
===================================================================
--- modules/faces/trunk/pom.xml 2010-06-01 18:29:39 UTC (rev 12925)
+++ modules/faces/trunk/pom.xml 2010-06-01 18:34:25 UTC (rev 12926)
@@ -21,6 +21,24 @@
<url>http://www.seamframework.org</url>
+ <!-- TODO Remove -->
+ <!-- Snapshots repo to get parent -->
+ <repositories>
+ <repository>
+ <id>oss.sonatype.org/jboss-snapshots</id>
+ <name>JBoss (Nexus) Snapshots Repository</name>
+ <url>http://oss.sonatype.org/content/repositories/jboss-snapshots
+ </url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+
<modules>
<module>api</module>
<module>impl</module>
@@ -53,24 +71,6 @@
</dependencies>
</dependencyManagement>
- <!-- TODO Remove -->
- <!-- Snapshots repo to get parent -->
- <repositories>
- <repository>
- <id>oss.sonatype.org/jboss-snapshots</id>
- <name>JBoss (Nexus) Snapshots Repository</name>
- <url>http://oss.sonatype.org/content/repositories/jboss-snapshots
- </url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>org.jboss.seam.international</groupId>
@@ -169,6 +169,7 @@
<modules>
<module>dist</module>
<module>docs/reference</module>
+ <module>examples/short-ly</module>
</modules>
</profile>
<profile>
[View Less]
14 years, 9 months
Seam SVN: r12925 - modules/faces/trunk/docs/reference.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-06-01 14:29:39 -0400 (Tue, 01 Jun 2010)
New Revision: 12925
Modified:
modules/faces/trunk/docs/reference/pom.xml
Log:
oops
Modified: modules/faces/trunk/docs/reference/pom.xml
===================================================================
--- modules/faces/trunk/docs/reference/pom.xml 2010-06-01 17:53:09 UTC (rev 12924)
+++ modules/faces/trunk/docs/reference/pom.xml 2010-06-01 18:29:39 UTC (rev 12925)
@@ -12,7 +12,7 @@
<parent>
…
[View More]<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>10-SNAPSHOT</version>
+ <version>11-SNAPSHOT</version>
</parent>
<!-- TODO Remove -->
[View Less]
14 years, 9 months
Seam SVN: r12924 - modules/faces/trunk/examples/short-ly.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-06-01 13:53:09 -0400 (Tue, 01 Jun 2010)
New Revision: 12924
Modified:
modules/faces/trunk/examples/short-ly/pom.xml
Log:
minor
Modified: modules/faces/trunk/examples/short-ly/pom.xml
===================================================================
--- modules/faces/trunk/examples/short-ly/pom.xml 2010-06-01 17:45:45 UTC (rev 12923)
+++ modules/faces/trunk/examples/short-ly/pom.xml 2010-06-01 17:53:09 UTC (rev 12924)
@@ -85,7 +85,6 @@
&…
[View More]lt;version>1.8.0.10</version>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
[View Less]
14 years, 9 months