You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by lh...@apache.org on 2012/07/25 22:27:53 UTC
svn commit: r1365721 - in /shiro/trunk:
core/src/main/java/org/apache/shiro/realm/text/PropertiesRealm.java pom.xml
samples/pom.xml
Author: lhazlewood
Date: Wed Jul 25 20:27:53 2012
New Revision: 1365721
URL: http://svn.apache.org/viewvc?rev=1365721&view=rev
Log:
Merge from 1.2.x branch
Modified:
shiro/trunk/core/src/main/java/org/apache/shiro/realm/text/PropertiesRealm.java
shiro/trunk/pom.xml
shiro/trunk/samples/pom.xml
Modified: shiro/trunk/core/src/main/java/org/apache/shiro/realm/text/PropertiesRealm.java
URL: http://svn.apache.org/viewvc/shiro/trunk/core/src/main/java/org/apache/shiro/realm/text/PropertiesRealm.java?rev=1365721&r1=1365720&r2=1365721&view=diff
==============================================================================
--- shiro/trunk/core/src/main/java/org/apache/shiro/realm/text/PropertiesRealm.java (original)
+++ shiro/trunk/core/src/main/java/org/apache/shiro/realm/text/PropertiesRealm.java Wed Jul 25 20:27:53 2012
@@ -34,7 +34,6 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
-
/**
* A {@link TextConfigurationRealm} that defers all logic to the parent class, but just enables
* {@link java.util.Properties Properties} based configuration in addition to the parent class's String configuration.
@@ -168,6 +167,9 @@ public class PropertiesRealm extends Tex
}
}
+ /**
+ * Destroy reload scheduler if one exists.
+ */
public void destroy() {
try {
if (scheduler != null) {
@@ -177,6 +179,8 @@ public class PropertiesRealm extends Tex
if (log.isInfoEnabled()) {
log.info("Unable to cleanly shutdown Scheduler. Ignoring (shutting down)...", e);
}
+ } finally {
+ scheduler = null;
}
}
Modified: shiro/trunk/pom.xml
URL: http://svn.apache.org/viewvc/shiro/trunk/pom.xml?rev=1365721&r1=1365720&r2=1365721&view=diff
==============================================================================
--- shiro/trunk/pom.xml (original)
+++ shiro/trunk/pom.xml Wed Jul 25 20:27:53 2012
@@ -64,6 +64,9 @@
<properties>
+ <!-- Replaced by the build number plugin at build time: -->
+ <buildNumber>${user.name}-${maven.build.timestamp}</buildNumber>
+
<!-- non-dependency-based properties: -->
<shiro.osgi.importRange>[1.3, 2)</shiro.osgi.importRange>
Modified: shiro/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/shiro/trunk/samples/pom.xml?rev=1365721&r1=1365720&r2=1365721&view=diff
==============================================================================
--- shiro/trunk/samples/pom.xml (original)
+++ shiro/trunk/samples/pom.xml Wed Jul 25 20:27:53 2012
@@ -43,6 +43,22 @@
<module>quickstart-guice</module>
</modules>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <!-- Turn off this plugin - it often fails with the example projects:
+ http://shiro-developer.582600.n2.nabble.com/Failed-releases-and-Apache-Rat-tp7577605.html -->
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<reporting>
<plugins>
<plugin>