You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by ad...@apache.org on 2010/05/26 20:34:49 UTC
svn commit: r948527 [31/38] - in /incubator/shiro:
branches/shiro-root-1.0.x/ branches/shiro-root-1.0.x/all/
branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/
branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/aop/
branches/shir...
Propchange: incubator/shiro/trunk/samples/spring/src/main/webapp/WEB-INF/remoting-servlet.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/shiro/trunk/samples/spring/src/main/webapp/shiro.css
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring/src/main/webapp/shiro.css?rev=948527&r1=948526&r2=948527&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring/src/main/webapp/shiro.css (original)
+++ incubator/shiro/trunk/samples/spring/src/main/webapp/shiro.css Wed May 26 18:34:28 2010
@@ -1,48 +1,48 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-body {
- margin: 1px;
- padding: 1px;
- background: #fff;
- font: 12px 'Lucida Grande', Geneva, Verdana, Arial, sans-serif;
- color: #000;
-}
-
-table, td {
- font: 12px 'Lucida Grande', Geneva, Verdana, Arial, sans-serif;
- color: #000;
-}
-
-h1 {
- font: 24px;
-}
-
-img {
- border: thin black solid;
-}
-
-#contentBox {
- text-align: center;
- width: 50%;
- margin: auto;
- margin-top: 50px;
- color: black;
- background: #eee;
- border: thick #ccc solid;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+body {
+ margin: 1px;
+ padding: 1px;
+ background: #fff;
+ font: 12px 'Lucida Grande', Geneva, Verdana, Arial, sans-serif;
+ color: #000;
+}
+
+table, td {
+ font: 12px 'Lucida Grande', Geneva, Verdana, Arial, sans-serif;
+ color: #000;
+}
+
+h1 {
+ font: 24px;
+}
+
+img {
+ border: thin black solid;
+}
+
+#contentBox {
+ text-align: center;
+ width: 50%;
+ margin: auto;
+ margin-top: 50px;
+ color: black;
+ background: #eee;
+ border: thick #ccc solid;
}
\ No newline at end of file
Propchange: incubator/shiro/trunk/samples/spring/src/main/webapp/shiro.css
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/shiro/trunk/samples/standalone/src/main/java/MyRealm.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/standalone/src/main/java/MyRealm.java?rev=948527&r1=948526&r2=948527&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/standalone/src/main/java/MyRealm.java (original)
+++ incubator/shiro/trunk/samples/standalone/src/main/java/MyRealm.java Wed May 26 18:34:28 2010
@@ -1,79 +1,79 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.shiro.authz.AuthorizationInfo;
-import org.apache.shiro.realm.AuthorizingRealm;
-import org.apache.shiro.subject.PrincipalCollection;
-
-/**
- * @author Les Hazlewood
- */
-public class MyRealm extends AuthorizingRealm {
-
- public MyRealm() {
- }
-
- /**
- * Simulates a call to an underlying data store - in a 'real' application, this call would communicate with
- * an underlying data store via an EIS API (JDBC, JPA, Hibernate, etc).
- * <p/>
- * Note that when implementing your own realm, there is no need to check against a password (or other credentials)
- * in this method. The {@link org.apache.shiro.realm.AuthenticatingRealm AuthenticatingRealm} superclass will do
- * that automatically via the use of a configured
- * {@link org.apache.shiro.authc.credential.CredentialsMatcher CredentialsMatcher} (see this example's corresponding
- * {@code shiro.ini} file to see a configured credentials matcher).
- * <p/>
- * All that is required is that the account information include directly the credentials found in the EIS.
- *
- * @param username the username for the account data to retrieve
- * @return the Account information corresponding to the specified username:
- */
- protected SimpleAccount getAccount(String username) {
- //just create a dummy. A real app would construct one based on EIS access.
- SimpleAccount account = new SimpleAccount(username, "sha256EncodedPasswordFromDatabase", getName());
- //simulate some roles and permissions:
- account.addRole("user");
- account.addRole("admin");
- //most applications would assign permissions to Roles instead of users directly because this is much more
- //flexible (it is easier to configure roles and then change role-to-user assignments than it is to maintain
- // permissions for each user).
- // But these next lines assign permissions directly to this trivial account object just for simulation's sake:
- account.addStringPermission("blogEntry:edit"); //this user is allowed to 'edit' _any_ blogEntry
- //fine-grained instance level permission:
- account.addStringPermission("printer:print:laserjet2000"); //allowed to 'print' to the 'printer' identified
- //by the id 'laserjet2000'
-
- return account;
- }
-
- protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token) throws AuthenticationException {
- //we can safely cast to a UsernamePasswordToken here, because this class 'supports' UsernamePasswordToken
- //objects. See the Realm.supports() method if your application will use a different type of token.
- UsernamePasswordToken upToken = (UsernamePasswordToken) token;
- return getAccount(upToken.getUsername());
- }
-
- protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {
- //get the principal this realm cares about:
- String username = (String) getAvailablePrincipal(principals);
-
- //call the underlying EIS for the account data:
- return getAccount(username);
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.shiro.authz.AuthorizationInfo;
+import org.apache.shiro.realm.AuthorizingRealm;
+import org.apache.shiro.subject.PrincipalCollection;
+
+/**
+ * @author Les Hazlewood
+ */
+public class MyRealm extends AuthorizingRealm {
+
+ public MyRealm() {
+ }
+
+ /**
+ * Simulates a call to an underlying data store - in a 'real' application, this call would communicate with
+ * an underlying data store via an EIS API (JDBC, JPA, Hibernate, etc).
+ * <p/>
+ * Note that when implementing your own realm, there is no need to check against a password (or other credentials)
+ * in this method. The {@link org.apache.shiro.realm.AuthenticatingRealm AuthenticatingRealm} superclass will do
+ * that automatically via the use of a configured
+ * {@link org.apache.shiro.authc.credential.CredentialsMatcher CredentialsMatcher} (see this example's corresponding
+ * {@code shiro.ini} file to see a configured credentials matcher).
+ * <p/>
+ * All that is required is that the account information include directly the credentials found in the EIS.
+ *
+ * @param username the username for the account data to retrieve
+ * @return the Account information corresponding to the specified username:
+ */
+ protected SimpleAccount getAccount(String username) {
+ //just create a dummy. A real app would construct one based on EIS access.
+ SimpleAccount account = new SimpleAccount(username, "sha256EncodedPasswordFromDatabase", getName());
+ //simulate some roles and permissions:
+ account.addRole("user");
+ account.addRole("admin");
+ //most applications would assign permissions to Roles instead of users directly because this is much more
+ //flexible (it is easier to configure roles and then change role-to-user assignments than it is to maintain
+ // permissions for each user).
+ // But these next lines assign permissions directly to this trivial account object just for simulation's sake:
+ account.addStringPermission("blogEntry:edit"); //this user is allowed to 'edit' _any_ blogEntry
+ //fine-grained instance level permission:
+ account.addStringPermission("printer:print:laserjet2000"); //allowed to 'print' to the 'printer' identified
+ //by the id 'laserjet2000'
+
+ return account;
+ }
+
+ protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token) throws AuthenticationException {
+ //we can safely cast to a UsernamePasswordToken here, because this class 'supports' UsernamePasswordToken
+ //objects. See the Realm.supports() method if your application will use a different type of token.
+ UsernamePasswordToken upToken = (UsernamePasswordToken) token;
+ return getAccount(upToken.getUsername());
+ }
+
+ protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {
+ //get the principal this realm cares about:
+ String username = (String) getAvailablePrincipal(principals);
+
+ //call the underlying EIS for the account data:
+ return getAccount(username);
+ }
+}
Propchange: incubator/shiro/trunk/samples/standalone/src/main/java/MyRealm.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/shiro/trunk/samples/standalone/src/main/java/Standalone.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/standalone/src/main/java/Standalone.java?rev=948527&r1=948526&r2=948527&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/standalone/src/main/java/Standalone.java (original)
+++ incubator/shiro/trunk/samples/standalone/src/main/java/Standalone.java Wed May 26 18:34:28 2010
@@ -1,49 +1,49 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.config.IniConfiguration;
-import org.apache.shiro.subject.Subject;
-
-/**
- * @author Les Hazlewood
- * @since Aug 28, 2008 5:46:16 PM
- */
-public class Standalone {
-
- public static void main(String[] args) {
-
- IniConfiguration config = new IniConfiguration();
- //the following call will automatically use shiro.ini at the root of the classpath:
- config.init();
-
- //This is for Standalone (single-VM) applications that don't use a configuration container (Spring, JBoss, etc)
- //See its JavaDoc for our feelings on this.
- SecurityUtils.setSecurityManager(config.getSecurityManager());
-
- //Now you are ready to access the Subject, as shown in the Quickstart:
- Subject currentUser = SecurityUtils.getSubject();
-
- //anything else you want to do with the Subject (see the Quickstart for examples).
-
- currentUser.logout();
-
- System.exit(0);
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.config.IniConfiguration;
+import org.apache.shiro.subject.Subject;
+
+/**
+ * @author Les Hazlewood
+ * @since Aug 28, 2008 5:46:16 PM
+ */
+public class Standalone {
+
+ public static void main(String[] args) {
+
+ IniConfiguration config = new IniConfiguration();
+ //the following call will automatically use shiro.ini at the root of the classpath:
+ config.init();
+
+ //This is for Standalone (single-VM) applications that don't use a configuration container (Spring, JBoss, etc)
+ //See its JavaDoc for our feelings on this.
+ SecurityUtils.setSecurityManager(config.getSecurityManager());
+
+ //Now you are ready to access the Subject, as shown in the Quickstart:
+ Subject currentUser = SecurityUtils.getSubject();
+
+ //anything else you want to do with the Subject (see the Quickstart for examples).
+
+ currentUser.logout();
+
+ System.exit(0);
+ }
+}
Propchange: incubator/shiro/trunk/samples/standalone/src/main/java/Standalone.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/samples/standalone/src/main/resources/log4j.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/shiro/trunk/samples/standalone/src/main/resources/shiro.ini
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/standalone/src/main/resources/shiro.ini?rev=948527&r1=948526&r2=948527&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/standalone/src/main/resources/shiro.ini (original)
+++ incubator/shiro/trunk/samples/standalone/src/main/resources/shiro.ini Wed May 26 18:34:28 2010
@@ -1,34 +1,34 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-[main]
-# Any realms here will automatically be added to the default created securityManager. No need to define
-# a securityManager here unless you want to override the default. If you want to override the default, you would
-# do it by uncommenting this line and specifying the fully qualified class name of your SecurityManager implementation:
-# securityManager = my.domain.package.MySecurityManager
-
-# define the realm(s) we want to use for our application. If you have more than one realm, the order in which they
-# are defined is the order in which they will be consulted during the authentication process.
-# This simple example uses only a single realm, but you could add more for more complicated requirements.
-
-# We'll use credentials hashing, since that keeps the users' credentials (passwords, private keys, etc) safe:
-myRealmCredentialsMatcher = org.apache.shiro.authc.credential.Sha256CredentialsMatcher
-
-# now define the realm, and specify that it use the above credentials matcher:
-myRealm = MyRealm
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+[main]
+# Any realms here will automatically be added to the default created securityManager. No need to define
+# a securityManager here unless you want to override the default. If you want to override the default, you would
+# do it by uncommenting this line and specifying the fully qualified class name of your SecurityManager implementation:
+# securityManager = my.domain.package.MySecurityManager
+
+# define the realm(s) we want to use for our application. If you have more than one realm, the order in which they
+# are defined is the order in which they will be consulted during the authentication process.
+# This simple example uses only a single realm, but you could add more for more complicated requirements.
+
+# We'll use credentials hashing, since that keeps the users' credentials (passwords, private keys, etc) safe:
+myRealmCredentialsMatcher = org.apache.shiro.authc.credential.Sha256CredentialsMatcher
+
+# now define the realm, and specify that it use the above credentials matcher:
+myRealm = MyRealm
myRealm.credentialsMatcher = $myRealmCredentialsMatcher
\ No newline at end of file
Propchange: incubator/shiro/trunk/samples/standalone/src/main/resources/shiro.ini
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/samples/web/src/main/resources/log4j.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/samples/web/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/samples/web/src/main/webapp/home.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/samples/web/src/main/webapp/include.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/samples/web/src/main/webapp/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/samples/web/src/main/webapp/login.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/samples/web/src/main/webapp/logout.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/samples/web/src/main/webapp/style.css
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/shiro/trunk/samples/web/src/test/java/org/apache/shiro/test/AbstractContainerTest.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/web/src/test/java/org/apache/shiro/test/AbstractContainerTest.java?rev=948527&r1=948526&r2=948527&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/web/src/test/java/org/apache/shiro/test/AbstractContainerTest.java (original)
+++ incubator/shiro/trunk/samples/web/src/test/java/org/apache/shiro/test/AbstractContainerTest.java Wed May 26 18:34:28 2010
@@ -1,72 +1,72 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.shiro.test;
-
-import com.gargoylesoftware.htmlunit.WebClient;
-import static org.junit.Assert.assertTrue;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.nio.SelectChannelConnector;
-import org.mortbay.jetty.webapp.WebAppContext;
-
-public abstract class AbstractContainerTest {
- protected static PauseableServer server;
-
- protected static final int port = 9180;
-
- protected static final String BASEURI = "http://localhost:" + port + "/";
-
- protected final WebClient webClient = new WebClient();
-
- @BeforeClass
- public static void startContainer() throws Exception {
- if (server == null) {
- server = new PauseableServer();
- Connector connector = new SelectChannelConnector();
- connector.setPort(port);
- server.setConnectors(new Connector[]{connector});
- server.setHandler(new WebAppContext("src/main/webapp", "/"));
- server.start();
- assertTrue(server.isStarted());
- }
- }
-
- @Before
- public void beforeTest() {
- webClient.setThrowExceptionOnFailingStatusCode(true);
- }
-
- public void pauseServer(boolean paused) {
- if (server != null) server.pause(paused);
- }
-
- public static class PauseableServer extends Server {
- public synchronized void pause(boolean paused) {
- try {
- if (paused) for (Connector connector : getConnectors())
- connector.stop();
- else for (Connector connector : getConnectors())
- connector.start();
- } catch (Exception e) {
- }
- }
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.shiro.test;
+
+import com.gargoylesoftware.htmlunit.WebClient;
+import static org.junit.Assert.assertTrue;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.mortbay.jetty.Connector;
+import org.mortbay.jetty.Server;
+import org.mortbay.jetty.nio.SelectChannelConnector;
+import org.mortbay.jetty.webapp.WebAppContext;
+
+public abstract class AbstractContainerTest {
+ protected static PauseableServer server;
+
+ protected static final int port = 9180;
+
+ protected static final String BASEURI = "http://localhost:" + port + "/";
+
+ protected final WebClient webClient = new WebClient();
+
+ @BeforeClass
+ public static void startContainer() throws Exception {
+ if (server == null) {
+ server = new PauseableServer();
+ Connector connector = new SelectChannelConnector();
+ connector.setPort(port);
+ server.setConnectors(new Connector[]{connector});
+ server.setHandler(new WebAppContext("src/main/webapp", "/"));
+ server.start();
+ assertTrue(server.isStarted());
+ }
+ }
+
+ @Before
+ public void beforeTest() {
+ webClient.setThrowExceptionOnFailingStatusCode(true);
+ }
+
+ public void pauseServer(boolean paused) {
+ if (server != null) server.pause(paused);
+ }
+
+ public static class PauseableServer extends Server {
+ public synchronized void pause(boolean paused) {
+ try {
+ if (paused) for (Connector connector : getConnectors())
+ connector.stop();
+ else for (Connector connector : getConnectors())
+ connector.start();
+ } catch (Exception e) {
+ }
+ }
+ }
+}
Propchange: incubator/shiro/trunk/samples/web/src/test/java/org/apache/shiro/test/AbstractContainerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/shiro/trunk/samples/web/src/test/java/org/apache/shiro/test/ContainerIntegrationTest.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/web/src/test/java/org/apache/shiro/test/ContainerIntegrationTest.java?rev=948527&r1=948526&r2=948527&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/web/src/test/java/org/apache/shiro/test/ContainerIntegrationTest.java (original)
+++ incubator/shiro/trunk/samples/web/src/test/java/org/apache/shiro/test/ContainerIntegrationTest.java Wed May 26 18:34:28 2010
@@ -1,80 +1,80 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.shiro.test;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.gargoylesoftware.htmlunit.ElementNotFoundException;
-import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
-import com.gargoylesoftware.htmlunit.WebAssert;
-import com.gargoylesoftware.htmlunit.html.HtmlCheckBoxInput;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.html.HtmlInput;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-
-public class ContainerIntegrationTest extends AbstractContainerTest {
-
- @Before
- public void logOut() throws IOException {
- // Make sure we are logged out
- final HtmlPage homePage = webClient.getPage(BASEURI);
- try {
- homePage.getAnchorByHref("/logout.jsp").click();
- }
- catch (ElementNotFoundException e) {
- //Ignore
- }
- }
-
- @Test
- public void logIn() throws FailingHttpStatusCodeException, MalformedURLException, IOException, InterruptedException {
-
- HtmlPage page = webClient.getPage(BASEURI + "login.jsp");
- HtmlForm form = page.getFormByName("loginform");
- form.<HtmlInput>getInputByName("username").setValueAttribute("root");
- form.<HtmlInput>getInputByName("password").setValueAttribute("secret");
- page = form.<HtmlInput>getInputByName("submit").click();
- // This'll throw an expection if not logged in
- page.getAnchorByHref("/logout.jsp");
- }
-
- @Test
- public void logInAndRememberMe() throws Exception {
- HtmlPage page = webClient.getPage(BASEURI + "login.jsp");
- HtmlForm form = page.getFormByName("loginform");
- form.<HtmlInput>getInputByName("username").setValueAttribute("root");
- form.<HtmlInput>getInputByName("password").setValueAttribute("secret");
- HtmlCheckBoxInput checkbox = form.getInputByName("rememberMe");
- checkbox.setChecked(true);
- page = form.<HtmlInput>getInputByName("submit").click();
- server.stop();
- server.start();
- page = webClient.getPage(BASEURI);
- // page.getAnchorByHref("/logout.jsp");
- WebAssert.assertLinkPresentWithText(page, "Log out");
- page = page.getAnchorByHref("/account").click();
- // login page should be shown again - user remembered but not authenticated
- WebAssert.assertFormPresent(page, "loginform");
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.shiro.test;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.gargoylesoftware.htmlunit.ElementNotFoundException;
+import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
+import com.gargoylesoftware.htmlunit.WebAssert;
+import com.gargoylesoftware.htmlunit.html.HtmlCheckBoxInput;
+import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import com.gargoylesoftware.htmlunit.html.HtmlInput;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+
+public class ContainerIntegrationTest extends AbstractContainerTest {
+
+ @Before
+ public void logOut() throws IOException {
+ // Make sure we are logged out
+ final HtmlPage homePage = webClient.getPage(BASEURI);
+ try {
+ homePage.getAnchorByHref("/logout.jsp").click();
+ }
+ catch (ElementNotFoundException e) {
+ //Ignore
+ }
+ }
+
+ @Test
+ public void logIn() throws FailingHttpStatusCodeException, MalformedURLException, IOException, InterruptedException {
+
+ HtmlPage page = webClient.getPage(BASEURI + "login.jsp");
+ HtmlForm form = page.getFormByName("loginform");
+ form.<HtmlInput>getInputByName("username").setValueAttribute("root");
+ form.<HtmlInput>getInputByName("password").setValueAttribute("secret");
+ page = form.<HtmlInput>getInputByName("submit").click();
+ // This'll throw an expection if not logged in
+ page.getAnchorByHref("/logout.jsp");
+ }
+
+ @Test
+ public void logInAndRememberMe() throws Exception {
+ HtmlPage page = webClient.getPage(BASEURI + "login.jsp");
+ HtmlForm form = page.getFormByName("loginform");
+ form.<HtmlInput>getInputByName("username").setValueAttribute("root");
+ form.<HtmlInput>getInputByName("password").setValueAttribute("secret");
+ HtmlCheckBoxInput checkbox = form.getInputByName("rememberMe");
+ checkbox.setChecked(true);
+ page = form.<HtmlInput>getInputByName("submit").click();
+ server.stop();
+ server.start();
+ page = webClient.getPage(BASEURI);
+ // page.getAnchorByHref("/logout.jsp");
+ WebAssert.assertLinkPresentWithText(page, "Log out");
+ page = page.getAnchorByHref("/account").click();
+ // login page should be shown again - user remembered but not authenticated
+ WebAssert.assertFormPresent(page, "loginform");
+ }
+
+}
Propchange: incubator/shiro/trunk/samples/web/src/test/java/org/apache/shiro/test/ContainerIntegrationTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/shiro/trunk/support/aspectj/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/support/aspectj/pom.xml?rev=948527&r1=948526&r2=948527&view=diff
==============================================================================
--- incubator/shiro/trunk/support/aspectj/pom.xml (original)
+++ incubator/shiro/trunk/support/aspectj/pom.xml Wed May 26 18:34:28 2010
@@ -1,87 +1,87 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>shiro-aspectj</artifactId>
- <name>Apache Shiro :: Support :: AspectJ</name>
- <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
- <version>1.6.7</version>
- </dependency>
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjweaver</artifactId>
- <version>1.6.8</version>
- </dependency>
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>aspectj-maven-plugin</artifactId>
- <version>1.3</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <showWeaveInfo>true</showWeaveInfo>
- </configuration>
- <executions>
- <execution>
- <id>aspectj-compile</id>
- <goals>
- <goal>compile</goal>
- <goal>test-compile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-root</artifactId>
+ <version>1.1.0-incubating-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>shiro-aspectj</artifactId>
+ <name>Apache Shiro :: Support :: AspectJ</name>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>1.6.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ <version>1.6.8</version>
+ </dependency>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>aspectj-maven-plugin</artifactId>
+ <version>1.3</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <showWeaveInfo>true</showWeaveInfo>
+ </configuration>
+ <executions>
+ <execution>
+ <id>aspectj-compile</id>
+ <goals>
+ <goal>compile</goal>
+ <goal>test-compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: incubator/shiro/trunk/support/aspectj/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/support/aspectj/src/main/aspect/org/apache/shiro/aspectj/ShiroAnnotationAuthorizingAspect.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/support/aspectj/src/main/java/org/apache/shiro/aspectj/AspectjAnnotationsAuthorizingMethodInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/support/aspectj/src/main/java/org/apache/shiro/aspectj/BeforeAdviceMethodInvocationAdapter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/support/aspectj/src/main/java/org/apache/shiro/aspectj/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/support/aspectj/src/test/java/org/apache/shiro/aspectj/DummyService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/support/aspectj/src/test/java/org/apache/shiro/aspectj/DummyServiceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/support/aspectj/src/test/java/org/apache/shiro/aspectj/RestrictedDummyService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/support/aspectj/src/test/java/org/apache/shiro/aspectj/SecuredDummyService.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/shiro/trunk/support/aspectj/src/test/resources/META-INF/aop.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/support/aspectj/src/test/resources/META-INF/aop.xml?rev=948527&r1=948526&r2=948527&view=diff
==============================================================================
--- incubator/shiro/trunk/support/aspectj/src/test/resources/META-INF/aop.xml (original)
+++ incubator/shiro/trunk/support/aspectj/src/test/resources/META-INF/aop.xml Wed May 26 18:34:28 2010
@@ -1,28 +1,28 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<aspectj>
- <aspects>
- <aspect name="org.apache.shiro.aspectj.ShiroAnnotationAuthorizingAspect"/>
- </aspects>
-
- <weaver options="-verbose">
- <include within="org.apache.shiro.aspectj.*"/>
- </weaver>
-
-</aspectj>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<aspectj>
+ <aspects>
+ <aspect name="org.apache.shiro.aspectj.ShiroAnnotationAuthorizingAspect"/>
+ </aspects>
+
+ <weaver options="-verbose">
+ <include within="org.apache.shiro.aspectj.*"/>
+ </weaver>
+
+</aspectj>
Propchange: incubator/shiro/trunk/support/aspectj/src/test/resources/META-INF/aop.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/shiro/trunk/support/aspectj/src/test/resources/shiroDummyServiceTest.ini
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/support/aspectj/src/test/resources/shiroDummyServiceTest.ini?rev=948527&r1=948526&r2=948527&view=diff
==============================================================================
--- incubator/shiro/trunk/support/aspectj/src/test/resources/shiroDummyServiceTest.ini (original)
+++ incubator/shiro/trunk/support/aspectj/src/test/resources/shiroDummyServiceTest.ini Wed May 26 18:34:28 2010
@@ -1,41 +1,41 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-
-# -----------------------------------------------------------------------------
-# Users and their assigned roles
-#
-# Each line conforms to the format defined in the
-# org.apache.shiro.realm.text.TextConfigurationRealm#setUserDefinitions JavaDoc
-# -----------------------------------------------------------------------------
-[users]
-root = secret, admin
-joe = bob, user
-john = doe
-
-
-# -----------------------------------------------------------------------------
-# Roles with assigned permissions
-#
-# Each line conforms to the format defined in the
-# org.apache.shiro.realm.text.TextConfigurationRealm#setRoleDefinitions JavaDoc
-# -----------------------------------------------------------------------------
-[roles]
-admin = dummy:*
-user = dummy:user
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+
+# -----------------------------------------------------------------------------
+# Users and their assigned roles
+#
+# Each line conforms to the format defined in the
+# org.apache.shiro.realm.text.TextConfigurationRealm#setUserDefinitions JavaDoc
+# -----------------------------------------------------------------------------
+[users]
+root = secret, admin
+joe = bob, user
+john = doe
+
+
+# -----------------------------------------------------------------------------
+# Roles with assigned permissions
+#
+# Each line conforms to the format defined in the
+# org.apache.shiro.realm.text.TextConfigurationRealm#setRoleDefinitions JavaDoc
+# -----------------------------------------------------------------------------
+[roles]
+admin = dummy:*
+user = dummy:user
Propchange: incubator/shiro/trunk/support/aspectj/src/test/resources/shiroDummyServiceTest.ini
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/support/ehcache/src/main/java/org/apache/shiro/cache/ehcache/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/support/ehcache/src/main/resources/org/apache/shiro/cache/ehcache/ehcache.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/support/ehcache/src/test/java/org/apache/shiro/cache/ehcache/EhCacheManagerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/support/ehcache/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/shiro/trunk/support/groovy/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/support/groovy/pom.xml?rev=948527&r1=948526&r2=948527&view=diff
==============================================================================
--- incubator/shiro/trunk/support/groovy/pom.xml (original)
+++ incubator/shiro/trunk/support/groovy/pom.xml Wed May 26 18:34:28 2010
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<!--suppress osmorcNonOsgiMavenDependency -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>shiro-groovy</artifactId>
- <name>Apache Shiro :: Support :: Groovy</name>
- <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- </dependency>
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- </dependencies>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<!--suppress osmorcNonOsgiMavenDependency -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-root</artifactId>
+ <version>1.1.0-incubating-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>shiro-groovy</artifactId>
+ <name>Apache Shiro :: Support :: Groovy</name>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ </dependency>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
Propchange: incubator/shiro/trunk/support/groovy/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/support/quartz/src/main/java/org/apache/shiro/session/mgt/quartz/QuartzSessionValidationJob.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/support/quartz/src/main/java/org/apache/shiro/session/mgt/quartz/QuartzSessionValidationScheduler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/support/quartz/src/main/java/org/apache/shiro/session/mgt/quartz/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/support/spring/src/main/java/org/apache/shiro/spring/LifecycleBeanPostProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/support/spring/src/main/java/org/apache/shiro/spring/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/support/spring/src/main/java/org/apache/shiro/spring/remoting/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/support/spring/src/main/java/org/apache/shiro/spring/security/interceptor/AopAllianceAnnotationsAuthorizingMethodInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/support/spring/src/main/java/org/apache/shiro/spring/security/interceptor/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native