shiro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lhazlew...@apache.org
Subject svn commit: r1413100 - in /shiro/trunk: core/src/main/java/org/apache/shiro/config/event/ core/src/test/java/org/apache/shiro/authz/permission/ core/src/test/java/org/apache/shiro/config/ core/src/test/java/org/apache/shiro/subject/ samples/guice/ samp...
Date Fri, 23 Nov 2012 22:46:23 GMT
Author: lhazlewood
Date: Fri Nov 23 22:46:20 2012
New Revision: 1413100

URL: http://svn.apache.org/viewvc?rev=1413100&view=rev
Log:
fixe ASF license headers

Modified:
    shiro/trunk/core/src/main/java/org/apache/shiro/config/event/BeanEvent.java
    shiro/trunk/core/src/main/java/org/apache/shiro/config/event/BeanListener.java
    shiro/trunk/core/src/main/java/org/apache/shiro/config/event/BeanListenerSupport.java
    shiro/trunk/core/src/main/java/org/apache/shiro/config/event/ConfiguredBeanEvent.java
    shiro/trunk/core/src/main/java/org/apache/shiro/config/event/DestroyedBeanEvent.java
    shiro/trunk/core/src/main/java/org/apache/shiro/config/event/InstantiatedBeanEvent.java
    shiro/trunk/core/src/main/java/org/apache/shiro/config/event/LoggingBeanListener.java
    shiro/trunk/core/src/test/java/org/apache/shiro/authz/permission/DomainPermissionTest.java
    shiro/trunk/core/src/test/java/org/apache/shiro/config/RecordingBeanListener.java
    shiro/trunk/core/src/test/java/org/apache/shiro/subject/SimplePrincipalCollectionTest.java
    shiro/trunk/samples/guice/pom.xml
    shiro/trunk/samples/guice/src/main/java/org/apache/shiro/samples/guice/SampleShiroGuiceBootstrap.java
    shiro/trunk/samples/guice/src/main/java/org/apache/shiro/samples/guice/SampleShiroNativeSessionsServletModule.java
    shiro/trunk/samples/guice/src/main/java/org/apache/shiro/samples/guice/SampleShiroServletModule.java
    shiro/trunk/samples/guice/src/main/resources/log4j.properties
    shiro/trunk/samples/guice/src/main/webapp/WEB-INF/shiro.ini
    shiro/trunk/samples/quickstart-guice/pom.xml
    shiro/trunk/samples/quickstart-guice/src/main/java/QuickstartGuice.java
    shiro/trunk/samples/quickstart-guice/src/main/java/QuickstartShiroModule.java

Modified: shiro/trunk/core/src/main/java/org/apache/shiro/config/event/BeanEvent.java
URL: http://svn.apache.org/viewvc/shiro/trunk/core/src/main/java/org/apache/shiro/config/event/BeanEvent.java?rev=1413100&r1=1413099&r2=1413100&view=diff
==============================================================================
--- shiro/trunk/core/src/main/java/org/apache/shiro/config/event/BeanEvent.java (original)
+++ shiro/trunk/core/src/main/java/org/apache/shiro/config/event/BeanEvent.java Fri Nov 23
22:46:20 2012
@@ -1,8 +1,29 @@
+/*
+ * 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.config.event;
 
 import java.util.EventObject;
 import java.util.Map;
 
+/**
+ * @since 1.3
+ */
 public class BeanEvent extends EventObject {
     private String beanName;
     private Object bean;

Modified: shiro/trunk/core/src/main/java/org/apache/shiro/config/event/BeanListener.java
URL: http://svn.apache.org/viewvc/shiro/trunk/core/src/main/java/org/apache/shiro/config/event/BeanListener.java?rev=1413100&r1=1413099&r2=1413100&view=diff
==============================================================================
--- shiro/trunk/core/src/main/java/org/apache/shiro/config/event/BeanListener.java (original)
+++ shiro/trunk/core/src/main/java/org/apache/shiro/config/event/BeanListener.java Fri Nov
23 22:46:20 2012
@@ -1,3 +1,21 @@
+/*
+ * 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.config.event;
 
 /**
@@ -8,6 +26,8 @@ package org.apache.shiro.config.event;
  *
  * The type of event is determined by the type of the beanEvent object.  Use of {@see BeanListenerSupport}
is
  * recommended.
+ *
+ * @since 1.3
  */
 public interface BeanListener {
     void onBeanEvent(BeanEvent beanEvent);

Modified: shiro/trunk/core/src/main/java/org/apache/shiro/config/event/BeanListenerSupport.java
URL: http://svn.apache.org/viewvc/shiro/trunk/core/src/main/java/org/apache/shiro/config/event/BeanListenerSupport.java?rev=1413100&r1=1413099&r2=1413100&view=diff
==============================================================================
--- shiro/trunk/core/src/main/java/org/apache/shiro/config/event/BeanListenerSupport.java
(original)
+++ shiro/trunk/core/src/main/java/org/apache/shiro/config/event/BeanListenerSupport.java
Fri Nov 23 22:46:20 2012
@@ -1,5 +1,26 @@
+/*
+ * 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.config.event;
 
+/**
+ * @since 1.3
+ */
 public abstract class BeanListenerSupport implements BeanListener {
     public void onBeanEvent(final BeanEvent beanEvent) {
         if (beanEvent instanceof InstantiatedBeanEvent) {

Modified: shiro/trunk/core/src/main/java/org/apache/shiro/config/event/ConfiguredBeanEvent.java
URL: http://svn.apache.org/viewvc/shiro/trunk/core/src/main/java/org/apache/shiro/config/event/ConfiguredBeanEvent.java?rev=1413100&r1=1413099&r2=1413100&view=diff
==============================================================================
--- shiro/trunk/core/src/main/java/org/apache/shiro/config/event/ConfiguredBeanEvent.java
(original)
+++ shiro/trunk/core/src/main/java/org/apache/shiro/config/event/ConfiguredBeanEvent.java
Fri Nov 23 22:46:20 2012
@@ -1,3 +1,21 @@
+/*
+ * 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.config.event;
 
 import java.util.Map;

Modified: shiro/trunk/core/src/main/java/org/apache/shiro/config/event/DestroyedBeanEvent.java
URL: http://svn.apache.org/viewvc/shiro/trunk/core/src/main/java/org/apache/shiro/config/event/DestroyedBeanEvent.java?rev=1413100&r1=1413099&r2=1413100&view=diff
==============================================================================
--- shiro/trunk/core/src/main/java/org/apache/shiro/config/event/DestroyedBeanEvent.java (original)
+++ shiro/trunk/core/src/main/java/org/apache/shiro/config/event/DestroyedBeanEvent.java Fri
Nov 23 22:46:20 2012
@@ -1,7 +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.
+ */
 package org.apache.shiro.config.event;
 
 import java.util.Map;
 
+/**
+ * @since 1.3
+ */
 public class DestroyedBeanEvent extends BeanEvent {
     public DestroyedBeanEvent(final String beanName, final Object bean, final Map<String,
Object> beanContext) {
         super(beanName, bean, beanContext);

Modified: shiro/trunk/core/src/main/java/org/apache/shiro/config/event/InstantiatedBeanEvent.java
URL: http://svn.apache.org/viewvc/shiro/trunk/core/src/main/java/org/apache/shiro/config/event/InstantiatedBeanEvent.java?rev=1413100&r1=1413099&r2=1413100&view=diff
==============================================================================
--- shiro/trunk/core/src/main/java/org/apache/shiro/config/event/InstantiatedBeanEvent.java
(original)
+++ shiro/trunk/core/src/main/java/org/apache/shiro/config/event/InstantiatedBeanEvent.java
Fri Nov 23 22:46:20 2012
@@ -1,7 +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.
+ */
 package org.apache.shiro.config.event;
 
 import java.util.Map;
 
+/**
+ * @since 1.3
+ */
 public class InstantiatedBeanEvent extends BeanEvent {
     public InstantiatedBeanEvent(final String beanName, final Object bean, final Map<String,
Object> beanContext) {
         super(beanName, bean, beanContext);

Modified: shiro/trunk/core/src/main/java/org/apache/shiro/config/event/LoggingBeanListener.java
URL: http://svn.apache.org/viewvc/shiro/trunk/core/src/main/java/org/apache/shiro/config/event/LoggingBeanListener.java?rev=1413100&r1=1413099&r2=1413100&view=diff
==============================================================================
--- shiro/trunk/core/src/main/java/org/apache/shiro/config/event/LoggingBeanListener.java
(original)
+++ shiro/trunk/core/src/main/java/org/apache/shiro/config/event/LoggingBeanListener.java
Fri Nov 23 22:46:20 2012
@@ -1,3 +1,21 @@
+/*
+ * 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.config.event;
 
 import org.slf4j.Logger;
@@ -5,6 +23,8 @@ import org.slf4j.LoggerFactory;
 
 /**
  * A stock bean listener implementation that logs all events via the standard logging mechanism.
+ *
+ * @since 1.3
  */
 public class LoggingBeanListener extends BeanListenerSupport {
 

Modified: shiro/trunk/core/src/test/java/org/apache/shiro/authz/permission/DomainPermissionTest.java
URL: http://svn.apache.org/viewvc/shiro/trunk/core/src/test/java/org/apache/shiro/authz/permission/DomainPermissionTest.java?rev=1413100&r1=1413099&r2=1413100&view=diff
==============================================================================
--- shiro/trunk/core/src/test/java/org/apache/shiro/authz/permission/DomainPermissionTest.java
(original)
+++ shiro/trunk/core/src/test/java/org/apache/shiro/authz/permission/DomainPermissionTest.java
Fri Nov 23 22:46:20 2012
@@ -1,3 +1,21 @@
+/*
+ * 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.authz.permission;
 
 import org.junit.Test;
@@ -7,8 +25,10 @@ import java.util.List;
 import java.util.Set;
 
 import static org.junit.Assert.*;
-import static org.junit.Assert.assertEquals;
 
+/**
+ * @since 1.3
+ */
 public class DomainPermissionTest {
     @Test
     public void testDefaultConstructor() {

Modified: shiro/trunk/core/src/test/java/org/apache/shiro/config/RecordingBeanListener.java
URL: http://svn.apache.org/viewvc/shiro/trunk/core/src/test/java/org/apache/shiro/config/RecordingBeanListener.java?rev=1413100&r1=1413099&r2=1413100&view=diff
==============================================================================
--- shiro/trunk/core/src/test/java/org/apache/shiro/config/RecordingBeanListener.java (original)
+++ shiro/trunk/core/src/test/java/org/apache/shiro/config/RecordingBeanListener.java Fri
Nov 23 22:46:20 2012
@@ -1,3 +1,21 @@
+/*
+ * 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.config;
 
 import org.apache.shiro.config.event.*;
@@ -5,6 +23,9 @@ import org.apache.shiro.config.event.*;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * @since 1.3
+ */
 public class RecordingBeanListener extends BeanListenerSupport {
 
     private List<InstantiatedBeanEvent> instantiateEvents = new ArrayList<InstantiatedBeanEvent>();

Modified: shiro/trunk/core/src/test/java/org/apache/shiro/subject/SimplePrincipalCollectionTest.java
URL: http://svn.apache.org/viewvc/shiro/trunk/core/src/test/java/org/apache/shiro/subject/SimplePrincipalCollectionTest.java?rev=1413100&r1=1413099&r2=1413100&view=diff
==============================================================================
--- shiro/trunk/core/src/test/java/org/apache/shiro/subject/SimplePrincipalCollectionTest.java
(original)
+++ shiro/trunk/core/src/test/java/org/apache/shiro/subject/SimplePrincipalCollectionTest.java
Fri Nov 23 22:46:20 2012
@@ -1,8 +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.
+ */
 package org.apache.shiro.subject;
 
-import junit.framework.TestCase;
 import org.junit.Test;
 
+/**
+ * @since 1.3
+ */
 public class SimplePrincipalCollectionTest {
     @Test
     public void multiplePrincipalsTest()

Modified: shiro/trunk/samples/guice/pom.xml
URL: http://svn.apache.org/viewvc/shiro/trunk/samples/guice/pom.xml?rev=1413100&r1=1413099&r2=1413100&view=diff
==============================================================================
--- shiro/trunk/samples/guice/pom.xml (original)
+++ shiro/trunk/samples/guice/pom.xml Fri Nov 23 22:46:20 2012
@@ -1,4 +1,22 @@
 <?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/xsd/maven-4.0.0.xsd">

Modified: shiro/trunk/samples/guice/src/main/java/org/apache/shiro/samples/guice/SampleShiroGuiceBootstrap.java
URL: http://svn.apache.org/viewvc/shiro/trunk/samples/guice/src/main/java/org/apache/shiro/samples/guice/SampleShiroGuiceBootstrap.java?rev=1413100&r1=1413099&r2=1413100&view=diff
==============================================================================
--- shiro/trunk/samples/guice/src/main/java/org/apache/shiro/samples/guice/SampleShiroGuiceBootstrap.java
(original)
+++ shiro/trunk/samples/guice/src/main/java/org/apache/shiro/samples/guice/SampleShiroGuiceBootstrap.java
Fri Nov 23 22:46:20 2012
@@ -1,3 +1,21 @@
+/*
+ * 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.samples.guice;
 
 import com.google.inject.Guice;

Modified: shiro/trunk/samples/guice/src/main/java/org/apache/shiro/samples/guice/SampleShiroNativeSessionsServletModule.java
URL: http://svn.apache.org/viewvc/shiro/trunk/samples/guice/src/main/java/org/apache/shiro/samples/guice/SampleShiroNativeSessionsServletModule.java?rev=1413100&r1=1413099&r2=1413100&view=diff
==============================================================================
--- shiro/trunk/samples/guice/src/main/java/org/apache/shiro/samples/guice/SampleShiroNativeSessionsServletModule.java
(original)
+++ shiro/trunk/samples/guice/src/main/java/org/apache/shiro/samples/guice/SampleShiroNativeSessionsServletModule.java
Fri Nov 23 22:46:20 2012
@@ -1,3 +1,21 @@
+/*
+ * 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.samples.guice;
 
 import com.google.inject.Provides;
@@ -6,7 +24,6 @@ import com.google.inject.name.Names;
 import org.apache.shiro.config.Ini;
 import org.apache.shiro.guice.web.ShiroWebModule;
 import org.apache.shiro.realm.text.IniRealm;
-import org.apache.shiro.session.mgt.DefaultSessionManager;
 import org.apache.shiro.session.mgt.SessionManager;
 import org.apache.shiro.web.servlet.Cookie;
 import org.apache.shiro.web.servlet.SimpleCookie;

Modified: shiro/trunk/samples/guice/src/main/java/org/apache/shiro/samples/guice/SampleShiroServletModule.java
URL: http://svn.apache.org/viewvc/shiro/trunk/samples/guice/src/main/java/org/apache/shiro/samples/guice/SampleShiroServletModule.java?rev=1413100&r1=1413099&r2=1413100&view=diff
==============================================================================
--- shiro/trunk/samples/guice/src/main/java/org/apache/shiro/samples/guice/SampleShiroServletModule.java
(original)
+++ shiro/trunk/samples/guice/src/main/java/org/apache/shiro/samples/guice/SampleShiroServletModule.java
Fri Nov 23 22:46:20 2012
@@ -1,3 +1,21 @@
+/*
+ * 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.samples.guice;
 
 import com.google.inject.Provides;

Modified: shiro/trunk/samples/guice/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/shiro/trunk/samples/guice/src/main/resources/log4j.properties?rev=1413100&r1=1413099&r2=1413100&view=diff
==============================================================================
--- shiro/trunk/samples/guice/src/main/resources/log4j.properties (original)
+++ shiro/trunk/samples/guice/src/main/resources/log4j.properties Fri Nov 23 22:46:20 2012
@@ -16,7 +16,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-# This file is used to format all logging output
 log4j.rootLogger=TRACE, stdout
 
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender

Modified: shiro/trunk/samples/guice/src/main/webapp/WEB-INF/shiro.ini
URL: http://svn.apache.org/viewvc/shiro/trunk/samples/guice/src/main/webapp/WEB-INF/shiro.ini?rev=1413100&r1=1413099&r2=1413100&view=diff
==============================================================================
--- shiro/trunk/samples/guice/src/main/webapp/WEB-INF/shiro.ini (original)
+++ shiro/trunk/samples/guice/src/main/webapp/WEB-INF/shiro.ini Fri Nov 23 22:46:20 2012
@@ -15,6 +15,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+#
 
 # INI configuration is very powerful and flexible, while still remaining succinct.
 # Please http://shiro.apache.org/configuration.html and

Modified: shiro/trunk/samples/quickstart-guice/pom.xml
URL: http://svn.apache.org/viewvc/shiro/trunk/samples/quickstart-guice/pom.xml?rev=1413100&r1=1413099&r2=1413100&view=diff
==============================================================================
--- shiro/trunk/samples/quickstart-guice/pom.xml (original)
+++ shiro/trunk/samples/quickstart-guice/pom.xml Fri Nov 23 22:46:20 2012
@@ -1,4 +1,22 @@
 <?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/xsd/maven-4.0.0.xsd">

Modified: shiro/trunk/samples/quickstart-guice/src/main/java/QuickstartGuice.java
URL: http://svn.apache.org/viewvc/shiro/trunk/samples/quickstart-guice/src/main/java/QuickstartGuice.java?rev=1413100&r1=1413099&r2=1413100&view=diff
==============================================================================
--- shiro/trunk/samples/quickstart-guice/src/main/java/QuickstartGuice.java (original)
+++ shiro/trunk/samples/quickstart-guice/src/main/java/QuickstartGuice.java Fri Nov 23 22:46:20
2012
@@ -21,15 +21,12 @@ import com.google.inject.Guice;
 import com.google.inject.Injector;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.*;
-import org.apache.shiro.config.IniSecurityManagerFactory;
 import org.apache.shiro.mgt.SecurityManager;
 import org.apache.shiro.session.Session;
 import org.apache.shiro.subject.Subject;
-import org.apache.shiro.util.Factory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 /**
  * Simple Quickstart application showing how to use Shiro's API with Guice integration.
  *

Modified: shiro/trunk/samples/quickstart-guice/src/main/java/QuickstartShiroModule.java
URL: http://svn.apache.org/viewvc/shiro/trunk/samples/quickstart-guice/src/main/java/QuickstartShiroModule.java?rev=1413100&r1=1413099&r2=1413100&view=diff
==============================================================================
--- shiro/trunk/samples/quickstart-guice/src/main/java/QuickstartShiroModule.java (original)
+++ shiro/trunk/samples/quickstart-guice/src/main/java/QuickstartShiroModule.java Fri Nov
23 22:46:20 2012
@@ -1,3 +1,21 @@
+/*
+ * 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 com.google.inject.Provides;
 import org.apache.shiro.config.Ini;
 import org.apache.shiro.guice.ShiroModule;



Mime
View raw message