Seam SVN: r10813 - in examples/trunk/booking: ejb-jar and 3 other directories.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-05-06 02:46:19 -0400 (Wed, 06 May 2009)
New Revision: 10813
Removed:
examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/security/Credentials.java
examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/security/Identity.java
Modified:
examples/trunk/booking/ear/
examples/trunk/booking/ejb-jar/
examples/trunk/booking/ejb-jar/pom.xml
examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/account/AccountProducerBean.java
examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/account/RegistrarBean.java
examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/security/Authenticator.java
examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/security/AuthenticatorBean.java
examples/trunk/booking/war/
Log:
use security module
Property changes on: examples/trunk/booking/ear
___________________________________________________________________
Name: svn:ignore
- target
+ target
.project
.settings
Property changes on: examples/trunk/booking/ejb-jar
___________________________________________________________________
Name: svn:ignore
- target
+ target
.settings
.classpath
.project
Modified: examples/trunk/booking/ejb-jar/pom.xml
===================================================================
--- examples/trunk/booking/ejb-jar/pom.xml 2009-05-06 06:45:23 UTC (rev 10812)
+++ examples/trunk/booking/ejb-jar/pom.xml 2009-05-06 06:46:19 UTC (rev 10813)
@@ -98,6 +98,11 @@
<groupId>${seam.groupId}</groupId>
<artifactId>seam-faces</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>${seam.groupId}</groupId>
+ <artifactId>seam-security</artifactId>
+ </dependency>
<dependency>
<groupId>${webbeans.groupId}</groupId>
Modified: examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/account/AccountProducerBean.java
===================================================================
--- examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/account/AccountProducerBean.java 2009-05-06 06:45:23 UTC (rev 10812)
+++ examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/account/AccountProducerBean.java 2009-05-06 06:46:19 UTC (rev 10813)
@@ -8,7 +8,8 @@
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import org.jboss.seam.examples.booking.model.User;
-import org.jboss.seam.examples.booking.security.Identity;
+import org.jboss.seam.security.Credentials;
+import org.jboss.seam.security.Identity;
import org.jboss.webbeans.log.Log;
import org.jboss.webbeans.log.Logger;
@@ -24,6 +25,8 @@
@PersistenceContext EntityManager em;
@Current Identity identity;
+
+ @Current Credentials credentials;
public
@Produces
@@ -34,8 +37,8 @@
{
if (identity.isLoggedIn())
{
- log.info("Producing user from username {0}", identity.getUsername());
- User candidate = em.find(User.class, identity.getUsername());
+ log.info("Producing user from username {0}", credentials.getUsername());
+ User candidate = em.find(User.class, credentials.getUsername());
if (candidate != null)
{
return new User(candidate.getName(), candidate.getUsername());
Modified: examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/account/RegistrarBean.java
===================================================================
--- examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/account/RegistrarBean.java 2009-05-06 06:45:23 UTC (rev 10812)
+++ examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/account/RegistrarBean.java 2009-05-06 06:46:19 UTC (rev 10813)
@@ -9,10 +9,10 @@
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import org.jboss.seam.examples.booking.model.User;
-import org.jboss.seam.examples.booking.security.Credentials;
-import org.jboss.seam.examples.booking.security.Identity;
import org.jboss.seam.international.StatusMessage;
import org.jboss.seam.international.StatusMessages;
+import org.jboss.seam.security.Credentials;
+import org.jboss.seam.security.Identity;
import org.jboss.seam.examples.booking.controls.RegistrationFormControls;
/**
@@ -48,7 +48,7 @@
{
em.persist(newUser);
credentials.setUsername(newUser.getUsername());
- identity.autoLogin();
+ identity.login();
registered = true;
statusMessages.add("You have been successfully registered as the user {0}!", newUser.getUsername());
}
Modified: examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/security/Authenticator.java
===================================================================
--- examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/security/Authenticator.java 2009-05-06 06:45:23 UTC (rev 10812)
+++ examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/security/Authenticator.java 2009-05-06 06:46:19 UTC (rev 10813)
@@ -10,6 +10,6 @@
*/
public
@Local
-interface Authenticator {
- boolean authenticate();
+interface Authenticator extends org.jboss.seam.security.Authenticator {
+
}
Modified: examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/security/AuthenticatorBean.java
===================================================================
--- examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/security/AuthenticatorBean.java 2009-05-06 06:45:23 UTC (rev 10812)
+++ examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/security/AuthenticatorBean.java 2009-05-06 06:46:19 UTC (rev 10813)
@@ -5,6 +5,7 @@
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import org.jboss.seam.examples.booking.model.User;
+import org.jboss.seam.security.Credentials;
import org.jboss.webbeans.log.Log;
import org.jboss.webbeans.log.Logger;
Deleted: examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/security/Credentials.java
===================================================================
--- examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/security/Credentials.java 2009-05-06 06:45:23 UTC (rev 10812)
+++ examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/security/Credentials.java 2009-05-06 06:46:19 UTC (rev 10813)
@@ -1,47 +0,0 @@
-package org.jboss.seam.examples.booking.security;
-
-import java.io.Serializable;
-import javax.annotation.Named;
-import javax.context.SessionScoped;
-
-/**
- * Holds the user's credentials.
- *
- * @author Dan Allen
- */
-public
-@Named
-@SessionScoped
-class Credentials implements Serializable
-{
- private String username;
-
- private String password;
-
- public String getPassword()
- {
- return password;
- }
-
- public void setPassword(String password)
- {
- this.password = password;
- }
-
- public String getUsername()
- {
- return username;
- }
-
- public void setUsername(String username)
- {
- this.username = username;
- }
-
- public void clear()
- {
- this.username = null;
- this.password = null;
- }
-
-}
Deleted: examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/security/Identity.java
===================================================================
--- examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/security/Identity.java 2009-05-06 06:45:23 UTC (rev 10812)
+++ examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/security/Identity.java 2009-05-06 06:46:19 UTC (rev 10813)
@@ -1,74 +0,0 @@
-package org.jboss.seam.examples.booking.security;
-
-import java.io.Serializable;
-import javax.annotation.Named;
-import javax.context.SessionScoped;
-import javax.faces.context.FacesContext;
-import javax.inject.Current;
-import javax.inject.Initializer;
-import javax.inject.manager.Manager;
-
-/**
- * @author Dan Allen
- */
-public
-@Named
-@SessionScoped
-class Identity implements Serializable
-{
- @Current Authenticator authenticator;
-
- @Current Manager manager;
-
- private Credentials credentials;
-
- private boolean loggedIn;
-
- public Identity() {}
-
- public @Initializer Identity(Credentials credentials)
- {
- this.credentials = credentials;
- }
-
-
- public boolean isLoggedIn()
- {
- return loggedIn;
- }
-
- public String getUsername()
- {
- return credentials.getUsername();
- }
-
- public void autoLogin()
- {
- loggedIn = true;
- }
-
- public void login()
- {
- if (authenticator.authenticate())
- {
- loggedIn = true;
- // authenticationEvent.fire(new AuthenticationEvent(credentials), new AnnotationLiteral<Success>() {});
- return;
- }
-
- // authenticationEvent.fire(new AuthenticationEvent(credentials), new AnnotationLiteral<Failed>() {});
- }
-
- public void logout()
- {
- credentials.clear();
- loggedIn = false;
- // FIXME this is a dirty hack to reset a producer
- FacesContext.getCurrentInstance().getExternalContext().invalidateSession();
-
-// Set<Bean<User>> candidates = manager.resolveByType(User.class, new AnnotationLiteral<Registered>() {});
-// assert candidates.size() == 1;
-// User user = manager.getInstanceByType(User.class, new AnnotationLiteral<Registered>() {});
-// candidates.iterator().next().destroy(user);
- }
-}
Property changes on: examples/trunk/booking/war
___________________________________________________________________
Name: svn:ignore
- target
+ target
.classpath
.project
.settings
15 years, 7 months
Seam SVN: r10812 - in modules/trunk/security: src/main/java/org/jboss/seam/security and 3 other directories.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-05-06 02:45:23 -0400 (Wed, 06 May 2009)
New Revision: 10812
Added:
modules/trunk/security/src/main/resources/META-INF/
modules/trunk/security/src/main/resources/META-INF/beans.xml
Modified:
modules/trunk/security/pom.xml
modules/trunk/security/src/main/java/org/jboss/seam/security/Credentials.java
modules/trunk/security/src/main/java/org/jboss/seam/security/SecurityEventMessages.java
modules/trunk/security/src/main/java/org/jboss/seam/security/management/IdentityStore.java
modules/trunk/security/src/main/java/org/jboss/seam/security/management/LdapIdentityStore.java
Log:
fixed deployment issues
Modified: modules/trunk/security/pom.xml
===================================================================
--- modules/trunk/security/pom.xml 2009-05-06 06:24:40 UTC (rev 10811)
+++ modules/trunk/security/pom.xml 2009-05-06 06:45:23 UTC (rev 10812)
@@ -26,14 +26,17 @@
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.ejb</groupId>
<artifactId>ejb-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.drools</groupId>
@@ -62,6 +65,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/Credentials.java
===================================================================
--- modules/trunk/security/src/main/java/org/jboss/seam/security/Credentials.java 2009-05-06 06:24:40 UTC (rev 10811)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/Credentials.java 2009-05-06 06:45:23 UTC (rev 10812)
@@ -1,17 +1,11 @@
package org.jboss.seam.security;
-import java.io.IOException;
import java.io.Serializable;
import javax.annotation.Named;
import javax.context.SessionScoped;
import javax.inject.Current;
import javax.inject.manager.Manager;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.UnsupportedCallbackException;
import org.jboss.seam.security.events.CredentialsInitializedEvent;
import org.jboss.seam.security.events.CredentialsUpdatedEvent;
Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/SecurityEventMessages.java
===================================================================
--- modules/trunk/security/src/main/java/org/jboss/seam/security/SecurityEventMessages.java 2009-05-06 06:24:40 UTC (rev 10811)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/SecurityEventMessages.java 2009-05-06 06:45:23 UTC (rev 10812)
@@ -27,6 +27,7 @@
//ServletContexts.instance().getRequest(), identity.getPrincipal().getName());
}
+ /*
@Current StatusMessages statusMessages;
@Current Credentials credentials;
@@ -93,4 +94,6 @@
"You are already logged in, please log out first if you wish to log in again"
);
}
+
+ */
}
Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/management/IdentityStore.java
===================================================================
--- modules/trunk/security/src/main/java/org/jboss/seam/security/management/IdentityStore.java 2009-05-06 06:24:40 UTC (rev 10811)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/management/IdentityStore.java 2009-05-06 06:45:23 UTC (rev 10812)
@@ -1,5 +1,6 @@
package org.jboss.seam.security.management;
+import java.io.Serializable;
import java.security.Principal;
import java.util.HashSet;
import java.util.List;
@@ -19,8 +20,10 @@
/**
* Represents a set of optional features that an IdentityStore implementation might support.
*/
- public class FeatureSet
+ public class FeatureSet implements Serializable
{
+ private static final long serialVersionUID = 1100272929055626911L;
+
private Set<Feature> features;
public FeatureSet()
Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/management/LdapIdentityStore.java
===================================================================
--- modules/trunk/security/src/main/java/org/jboss/seam/security/management/LdapIdentityStore.java 2009-05-06 06:24:40 UTC (rev 10811)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/management/LdapIdentityStore.java 2009-05-06 06:45:23 UTC (rev 10812)
@@ -31,7 +31,6 @@
*
* @author Shane Bryzak
*/
-@Named("identityStore")
@ApplicationScoped
public class LdapIdentityStore implements IdentityStore, Serializable
{
@@ -372,13 +371,13 @@
return featureSet.supports(feature);
}
- protected final InitialLdapContext initialiseContext()
+ protected InitialLdapContext initialiseContext()
throws NamingException
{
return initialiseContext(getBindDN(), getBindCredentials());
}
- protected final InitialLdapContext initialiseContext(String principal, String credentials)
+ protected InitialLdapContext initialiseContext(String principal, String credentials)
throws NamingException
{
Properties env = new Properties();
Added: modules/trunk/security/src/main/resources/META-INF/beans.xml
===================================================================
15 years, 7 months
Seam SVN: r10811 - examples/trunk/servlet-permalink/src/main/webapp/WEB-INF/fragments.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-05-06 02:24:40 -0400 (Wed, 06 May 2009)
New Revision: 10811
Modified:
examples/trunk/servlet-permalink/src/main/webapp/WEB-INF/fragments/entryList.xhtml
Log:
add IDs for testing
Modified: examples/trunk/servlet-permalink/src/main/webapp/WEB-INF/fragments/entryList.xhtml
===================================================================
--- examples/trunk/servlet-permalink/src/main/webapp/WEB-INF/fragments/entryList.xhtml 2009-05-06 04:50:15 UTC (rev 10810)
+++ examples/trunk/servlet-permalink/src/main/webapp/WEB-INF/fragments/entryList.xhtml 2009-05-06 06:24:40 UTC (rev 10811)
@@ -16,14 +16,14 @@
<ui:include src="entryContent.xhtml"/>
</ui:repeat>
<div class="post-navigation">
- <span class="arrow">««</span> #{' '}<h:link value="First Page" disabled="#{not blog.previousPageAvailable}" includeViewParams="true"
+ <span class="arrow">««</span> #{' '}<h:link id="first" value="First Page" disabled="#{not blog.previousPageAvailable}" includeViewParams="true"
><f:param name="page" disable="true"
/></h:link>
- <span class="arrow">«</span> #{' '}<h:link value="Newer Entries" disabled="#{not blog.previousPageAvailable}" includeViewParams="true"
+ <span class="arrow">«</span> #{' '}<h:link id="previous" value="Newer Entries" disabled="#{not blog.previousPageAvailable}" includeViewParams="true"
><f:param name="page" value="#{blog.previousPage}"
/></h:link>
<span style="font-size: smaller;">–</span>
- #{' '}<h:link outcome="#{view.viewId}" value="Older Entries" disabled="#{not blog.nextPageAvailable}" includeViewParams="true"
+ #{' '}<h:link outcome="#{view.viewId}" id="next" value="Older Entries" disabled="#{not blog.nextPageAvailable}" includeViewParams="true"
><f:param name="page" value="#{blog.nextPage}"
/></h:link> <span class="arrow">»</span>
</div>
15 years, 7 months
Seam SVN: r10810 - branches/community/Seam_2_1/seam-gen/build-scripts.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2009-05-06 00:50:15 -0400 (Wed, 06 May 2009)
New Revision: 10810
Modified:
branches/community/Seam_2_1/seam-gen/build-scripts/deployed-jars-ear-war.list
branches/community/Seam_2_1/seam-gen/build-scripts/deployed-jars-ear.list
Log:
JBSEAM-4137
Modified: branches/community/Seam_2_1/seam-gen/build-scripts/deployed-jars-ear-war.list
===================================================================
--- branches/community/Seam_2_1/seam-gen/build-scripts/deployed-jars-ear-war.list 2009-05-06 03:13:20 UTC (rev 10809)
+++ branches/community/Seam_2_1/seam-gen/build-scripts/deployed-jars-ear-war.list 2009-05-06 04:50:15 UTC (rev 10810)
@@ -1,4 +1,3 @@
-commons-beanutils.jar
commons-digester.jar
jboss-seam-debug.jar
jboss-seam-excel.jar
Modified: branches/community/Seam_2_1/seam-gen/build-scripts/deployed-jars-ear.list
===================================================================
--- branches/community/Seam_2_1/seam-gen/build-scripts/deployed-jars-ear.list 2009-05-06 03:13:20 UTC (rev 10809)
+++ branches/community/Seam_2_1/seam-gen/build-scripts/deployed-jars-ear.list 2009-05-06 04:50:15 UTC (rev 10810)
@@ -1,4 +1,5 @@
antlr-runtime.jar
+commons-beanutils.jar
core.jar
drools-compiler.jar
drools-core.jar
15 years, 7 months
Seam SVN: r10809 - examples/trunk/servlet-permalink.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-05-05 23:13:20 -0400 (Tue, 05 May 2009)
New Revision: 10809
Modified:
examples/trunk/servlet-permalink/pom.xml
Log:
configure daemon mode for jetty so console can be reused while jetty is running
Modified: examples/trunk/servlet-permalink/pom.xml
===================================================================
--- examples/trunk/servlet-permalink/pom.xml 2009-05-06 02:49:31 UTC (rev 10808)
+++ examples/trunk/servlet-permalink/pom.xml 2009-05-06 03:13:20 UTC (rev 10809)
@@ -17,7 +17,9 @@
<properties>
<jetty.http.port>9090</jetty.http.port>
+ <jetty.stop.port>9091</jetty.stop.port>
<jetty.debug.port>9190</jetty.debug.port>
+ <jetty.daemon>true</jetty.daemon>
<tomcat.http.port>8080</tomcat.http.port>
<embedded-tomcat.http.port>9090</embedded-tomcat.http.port>
<embedded-tomcat.debug.port>9190</embedded-tomcat.debug.port>
@@ -140,7 +142,7 @@
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
- <!-- don't stage or package files added to src/main/webapp by war:inplace -->
+ <!-- don't stage or package files added to ${webapp.directory} by war:inplace -->
<warSourceExcludes>WEB-INF/classes/**,WEB-INF/lib/**</warSourceExcludes>
</configuration>
</plugin>
@@ -171,6 +173,9 @@
<maxIdleTime>3600000</maxIdleTime>
</connector>
</connectors>
+ <daemon>true</daemon>
+ <stopPort>${jetty.stop.port}</stopPort>
+ <stopKey>HASTA_LA_VISTA</stopKey>
<scanIntervalSeconds>10</scanIntervalSeconds>
<webAppConfig>
<contextPath>/${project.build.finalName}</contextPath>
@@ -189,9 +194,10 @@
<!-- userAliases are for cli:execute-phase -->
<userAliases>
<runjetty>compile org.apache.maven.plugins:maven-war-plugin:inplace org.mortbay.jetty:maven-jetty-plugin:run -o</runjetty>
+ <stopjetty>org.mortbay.jetty:maven-jetty-plugin:stop -o</stopjetty>
<runtomcat>compile org.apache.maven.plugins:maven-war-plugin:inplace org.codehaus.mojo:tomcat-maven-plugin:run -o</runtomcat>
- <refresh-all>compile org.apache.maven.plugins:maven-war-plugin:inplace -o</refresh-all>
- <refresh-web>org.apache.maven.plugins:maven-war-plugin:inplace -o</refresh-web>
+ <explode>compile org.apache.maven.plugins:maven-war-plugin:inplace -o</explode>
+ <restart>validate -Prestart-embedded -o</restart>
<profiles>org.apache.maven.plugins:maven-help-plugin:active-profiles -o</profiles>
<pom>org.apache.maven.plugins:maven-help-plugin:effective-pom -o</pom>
</userAliases>
@@ -204,4 +210,33 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>restart-embedded</id>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>touch-web-inf</id>
+ <phase>validate</phase>
+ <configuration>
+ <tasks>
+ <touch file="${webapp.directory}/WEB-INF/web.xml"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
15 years, 7 months
Seam SVN: r10808 - examples/trunk/servlet-permalink.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-05-05 22:49:31 -0400 (Tue, 05 May 2009)
New Revision: 10808
Modified:
examples/trunk/servlet-permalink/pom.xml
Log:
reorder elements
Modified: examples/trunk/servlet-permalink/pom.xml
===================================================================
--- examples/trunk/servlet-permalink/pom.xml 2009-05-06 02:32:09 UTC (rev 10807)
+++ examples/trunk/servlet-permalink/pom.xml 2009-05-06 02:49:31 UTC (rev 10808)
@@ -15,96 +15,6 @@
<name>Seam Permalink Example (Servlet)</name>
<description>The Seam permalink example for deployment to a servlet container</description>
- <build>
- <defaultGoal>package</defaultGoal>
- <finalName>${project.artifactId}</finalName>
- <plugins>
-
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <failOnError>false</failOnError>
- <filesets>
- <fileset>
- <!-- clean up files from war:inplace -->
- <directory>${webapp.directory}</directory>
- <includes>
- <include>WEB-INF/classes/**</include>
- <include>WEB-INF/lib/**</include>
- </includes>
- <followSymlinks>false</followSymlinks>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <!-- don't stage or package files added to src/main/webapp by war:inplace -->
- <warSourceExcludes>WEB-INF/classes/**,WEB-INF/lib/**</warSourceExcludes>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
- <configuration>
- <path>/${project.build.finalName}</path>
- <!-- uncomment to use server configuration override; see readme.txt for details -->
- <!--<server>tomcatserver</server>-->
- <url>http://localhost:${tomcat.http.port}/manager</url>
- <port>${embedded-tomcat.http.port}</port> <!-- port for embedded Tomcat only (putting this configuration in the execution for the run goal doesn't work) -->
- <!-- if you don't want to use war:inplace, uncomment this setting -->
- <!--
- <warSourceDirectory>${project.build.directory}/${project.build.finalName}</warSourceDirectory>
- -->
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <configuration>
- <connectors>
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
- <port>${jetty.http.port}</port>
- <maxIdleTime>3600000</maxIdleTime>
- </connector>
- </connectors>
- <scanIntervalSeconds>10</scanIntervalSeconds>
- <webAppConfig>
- <contextPath>/${project.build.finalName}</contextPath>
- </webAppConfig>
- <!-- if you don't want to use war:inplace, uncomment this setting -->
- <!--
- <webAppSourceDirectory>${project.build.directory}/${project.build.finalName}</webAppSourceDirectory>
- -->
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.twdata.maven</groupId>
- <artifactId>maven-cli-plugin</artifactId>
- <configuration>
- <!-- userAliases are for cli:execute-phase -->
- <userAliases>
- <runjetty>compile org.apache.maven.plugins:maven-war-plugin:inplace org.mortbay.jetty:maven-jetty-plugin:run -o</runjetty>
- <runtomcat>compile org.apache.maven.plugins:maven-war-plugin:inplace org.codehaus.mojo:tomcat-maven-plugin:run -o</runtomcat>
- <refresh-all>compile org.apache.maven.plugins:maven-war-plugin:inplace -o</refresh-all>
- <refresh-web>org.apache.maven.plugins:maven-war-plugin:inplace -o</refresh-web>
- <profiles>org.apache.maven.plugins:maven-help-plugin:active-profiles -o</profiles>
- <pom>org.apache.maven.plugins:maven-help-plugin:effective-pom -o</pom>
- </userAliases>
- <!-- commands are for cli:execute -->
- <commands>
- </commands>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
<properties>
<jetty.http.port>9090</jetty.http.port>
<jetty.debug.port>9190</jetty.debug.port>
@@ -204,4 +114,94 @@
</dependencies>
+ <build>
+ <defaultGoal>package</defaultGoal>
+ <finalName>${project.artifactId}</finalName>
+ <plugins>
+
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <failOnError>false</failOnError>
+ <filesets>
+ <fileset>
+ <!-- clean up files from war:inplace -->
+ <directory>${webapp.directory}</directory>
+ <includes>
+ <include>WEB-INF/classes/**</include>
+ <include>WEB-INF/lib/**</include>
+ </includes>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <!-- don't stage or package files added to src/main/webapp by war:inplace -->
+ <warSourceExcludes>WEB-INF/classes/**,WEB-INF/lib/**</warSourceExcludes>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>tomcat-maven-plugin</artifactId>
+ <configuration>
+ <path>/${project.build.finalName}</path>
+ <!-- uncomment to use server configuration override; see readme.txt for details -->
+ <!--<server>tomcatserver</server>-->
+ <url>http://localhost:${tomcat.http.port}/manager</url>
+ <port>${embedded-tomcat.http.port}</port> <!-- port for embedded Tomcat only (putting this configuration in the execution for the run goal doesn't work) -->
+ <!-- if you don't want to use war:inplace, uncomment this setting -->
+ <!--
+ <warSourceDirectory>${project.build.directory}/${project.build.finalName}</warSourceDirectory>
+ -->
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <configuration>
+ <connectors>
+ <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <port>${jetty.http.port}</port>
+ <maxIdleTime>3600000</maxIdleTime>
+ </connector>
+ </connectors>
+ <scanIntervalSeconds>10</scanIntervalSeconds>
+ <webAppConfig>
+ <contextPath>/${project.build.finalName}</contextPath>
+ </webAppConfig>
+ <!-- if you don't want to use war:inplace, uncomment this setting -->
+ <!--
+ <webAppSourceDirectory>${project.build.directory}/${project.build.finalName}</webAppSourceDirectory>
+ -->
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.twdata.maven</groupId>
+ <artifactId>maven-cli-plugin</artifactId>
+ <configuration>
+ <!-- userAliases are for cli:execute-phase -->
+ <userAliases>
+ <runjetty>compile org.apache.maven.plugins:maven-war-plugin:inplace org.mortbay.jetty:maven-jetty-plugin:run -o</runjetty>
+ <runtomcat>compile org.apache.maven.plugins:maven-war-plugin:inplace org.codehaus.mojo:tomcat-maven-plugin:run -o</runtomcat>
+ <refresh-all>compile org.apache.maven.plugins:maven-war-plugin:inplace -o</refresh-all>
+ <refresh-web>org.apache.maven.plugins:maven-war-plugin:inplace -o</refresh-web>
+ <profiles>org.apache.maven.plugins:maven-help-plugin:active-profiles -o</profiles>
+ <pom>org.apache.maven.plugins:maven-help-plugin:effective-pom -o</pom>
+ </userAliases>
+ <!-- commands are for cli:execute -->
+ <commands>
+ </commands>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+
</project>
15 years, 7 months
Seam SVN: r10807 - examples/trunk/servlet-permalink.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-05-05 22:32:09 -0400 (Tue, 05 May 2009)
New Revision: 10807
Modified:
examples/trunk/servlet-permalink/pom.xml
Log:
move maven-cli-plugin version to version-matrix
cleanup aliases for maven-cli-plugin
Modified: examples/trunk/servlet-permalink/pom.xml
===================================================================
--- examples/trunk/servlet-permalink/pom.xml 2009-05-06 02:04:14 UTC (rev 10806)
+++ examples/trunk/servlet-permalink/pom.xml 2009-05-06 02:32:09 UTC (rev 10807)
@@ -86,14 +86,13 @@
<plugin>
<groupId>org.twdata.maven</groupId>
<artifactId>maven-cli-plugin</artifactId>
- <version>0.6.3.CR2</version> <!-- TODO move to version-matrix -->
<configuration>
<!-- userAliases are for cli:execute-phase -->
<userAliases>
<runjetty>compile org.apache.maven.plugins:maven-war-plugin:inplace org.mortbay.jetty:maven-jetty-plugin:run -o</runjetty>
<runtomcat>compile org.apache.maven.plugins:maven-war-plugin:inplace org.codehaus.mojo:tomcat-maven-plugin:run -o</runtomcat>
- <explode>compile org.apache.maven.plugins:maven-war-plugin:inplace</explode>
- <explode-web>org.apache.maven.plugins:maven-war-plugin:inplace</explode-web>
+ <refresh-all>compile org.apache.maven.plugins:maven-war-plugin:inplace -o</refresh-all>
+ <refresh-web>org.apache.maven.plugins:maven-war-plugin:inplace -o</refresh-web>
<profiles>org.apache.maven.plugins:maven-help-plugin:active-profiles -o</profiles>
<pom>org.apache.maven.plugins:maven-help-plugin:effective-pom -o</pom>
</userAliases>
15 years, 7 months
Seam SVN: r10806 - modules/trunk/version-matrix.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-05-05 22:04:14 -0400 (Tue, 05 May 2009)
New Revision: 10806
Modified:
modules/trunk/version-matrix/pom.xml
Log:
add security module version
Modified: modules/trunk/version-matrix/pom.xml
===================================================================
--- modules/trunk/version-matrix/pom.xml 2009-05-06 02:02:06 UTC (rev 10805)
+++ modules/trunk/version-matrix/pom.xml 2009-05-06 02:04:14 UTC (rev 10806)
@@ -280,6 +280,12 @@
<version>${seam.version}</version>
</dependency>
+ <dependency>
+ <groupId>${seam.groupId}</groupId>
+ <artifactId>seam-security</artifactId>
+ <version>${seam.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
15 years, 7 months
Seam SVN: r10805 - modules/trunk/parent.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-05-05 22:02:06 -0400 (Tue, 05 May 2009)
New Revision: 10805
Modified:
modules/trunk/parent/pom.xml
Log:
add security module
Modified: modules/trunk/parent/pom.xml
===================================================================
--- modules/trunk/parent/pom.xml 2009-05-06 00:18:07 UTC (rev 10804)
+++ modules/trunk/parent/pom.xml 2009-05-06 02:02:06 UTC (rev 10805)
@@ -74,11 +74,6 @@
<url>http://in.relation.to/Bloggers/Shane</url>
<organization>JBoss, a division of Red Hat</organization>
</developer>
-
- <developer>
- <name>Norman Richards</name>
- <organization>JBoss, a division of Red Hat</organization>
- </developer>
<developer>
<name>Dan Allen</name>
@@ -98,7 +93,8 @@
<module>../version-matrix</module>
<module>../el</module>
<module>../international</module>
- <module>../faces</module>
+ <module>../security</module>
+ <module>../faces</module>
</modules>
<build>
15 years, 7 months
Seam SVN: r10804 - modules/trunk/jsf-upgrade-tool.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-05-05 20:18:07 -0400 (Tue, 05 May 2009)
New Revision: 10804
Modified:
modules/trunk/jsf-upgrade-tool/pom.xml
Log:
clarification
Modified: modules/trunk/jsf-upgrade-tool/pom.xml
===================================================================
--- modules/trunk/jsf-upgrade-tool/pom.xml 2009-05-05 23:15:56 UTC (rev 10803)
+++ modules/trunk/jsf-upgrade-tool/pom.xml 2009-05-06 00:18:07 UTC (rev 10804)
@@ -15,13 +15,18 @@
<name>JSF Upgrade Tool</name>
<description>
- The sole purpose of this Maven project is to upgrade the JSF libraries on JBoss AS 5 (or any other app server this
- build is made to support). It works by copying the dependencies (JSF) directly to the application server. In the
- case of JBoss AS 5, that is the jbossweb.sar in the domain's deploy directory.
+ The sole purpose of this Maven project is to upgrade the JSF libraries on
+ JBoss AS 5 (or any other app server this build is made to support). It works
+ by copying the dependencies (JSF) directly to the application server. In the
+ case of JBoss AS 5, that is the jbossweb.sar in the domain's deploy
+ directory.
- WARNING: The existing JSF libraries are overwritten, so you may want to back them up first.
+ WARNING: The existing JSF libraries are overwritten, so you may want to back
+ them up first.
- To run the project, type mvn from the commandline. The package goal will execute and perform the deployment.
+ To run the project, type mvn from the commandline. For JBoss AS 5
+ installations, the JBOSS_HOME environment variable must first be set.
+ The package goal will execute and perform the deployment.
</description>
<build>
15 years, 7 months