Merge branch 'master' into jetty-9.1

2013-08-20 14:02:45 -05:00 · 2013-08-20 14:02:45 -05:00 · 307fdced91
parent 34f03cb0e8 fd5d789ff5
commit 307fdced91
12 changed files with 53 additions and 45 deletions
--- a/jetty-nosql/pom.xml
+++ b/jetty-nosql/pom.xml
@ -14,16 +14,6 @@
  <build>
    <defaultGoal>install</defaultGoal>
    <plugins>
-      <!-- Jetty 7 is JDK5 +
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-          <verbose>false</verbose>
-        </configuration>
-      </plugin>
-       -->
      <plugin>
        <groupId>org.apache.felix</groupId>
        <artifactId>maven-bundle-plugin</artifactId>
--- a/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSession.java
+++ b/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSession.java
@ -63,16 +63,57 @@ public class NoSqlSession extends AbstractSession
    {
        synchronized (this)
        {
-            if (_dirty==null)
-                _dirty=new HashSet<String>();
-            _dirty.add(name);
            Object old = super.doPutOrRemove(name,value);
+            
            if (_manager.getSavePeriod()==-2)
+            {
                save(true);
+            }
            return old;
        }
    }
+    
+    

+    @Override
+    public void setAttribute(String name, Object value)
+    {
+        if ( updateAttribute(name,value) )
+        {
+            if (_dirty==null)
+            {
+                _dirty=new HashSet<String>();
+            }
+            
+            _dirty.add(name);
+        }
+    }
+
+    /*
+     * a boolean version of the setAttribute method that lets us manage the _dirty set
+     */
+    protected boolean updateAttribute (String name, Object value)
+    {
+        Object old=null;
+        synchronized (this)
+        {
+            checkValid();
+            old=doPutOrRemove(name,value);
+        }
+
+        if (value==null || !value.equals(old))
+        {
+            if (old!=null)
+                unbindValue(name,old);
+            if (value!=null)
+                bindValue(name,value);
+
+            _manager.doSessionAttributeListeners(this,name,old,value);
+            return true;
+        }
+        return false;
+    }
+    
    /* ------------------------------------------------------------ */
    @Override
    protected void checkValid() throws IllegalStateException
--- a/jetty-osgi/test-jetty-osgi-context/pom.xml
+++ b/jetty-osgi/test-jetty-osgi-context/pom.xml
@ -110,8 +110,6 @@
 *
                        </Import-Package>
                        <DynamicImport-Package>org.eclipse.jetty.*;version="[9.0,10.0)"</DynamicImport-Package>
-                        <!--Require-Bundle/-->
-                        <!-- Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment --> 
                    </instructions>
                </configuration>
            </plugin>
--- a/jetty-osgi/test-jetty-osgi-webapp/pom.xml
+++ b/jetty-osgi/test-jetty-osgi-webapp/pom.xml
@ -105,8 +105,6 @@
 *
                        </Import-Package>
                        <DynamicImport-Package>org.eclipse.jetty.*;version="[9.0,10.0)"</DynamicImport-Package>
-                        <!--Require-Bundle/-->
-                        <!-- Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment --> 
                    </instructions>
                </configuration>
            </plugin>
--- a/jetty-webapp/src/main/config/etc/webdefault.xml
+++ b/jetty-webapp/src/main/config/etc/webdefault.xml
@ -302,6 +302,14 @@
      <param-name>xpoweredBy</param-name>
      <param-value>false</param-value>
    </init-param>
+    <init-param>
+      <param-name>compilerTargetVM</param-name>
+      <param-value>1.7</param-value>
+    </init-param>
+    <init-param>
+      <param-name>compilerSourceVM</param-name>
+      <param-value>1.7</param-value>
+    </init-param>
    <!--  
    <init-param>
        <param-name>classpath</param-name>
--- a/pom.xml
+++ b/pom.xml
@ -376,7 +376,7 @@
        <artifactId>maven-pmd-plugin</artifactId>
        <version>2.7.1</version>
        <configuration>
-          <targetJdk>1.5</targetJdk>
+          <targetJdk>1.7</targetJdk>
          <rulesets>
            <ruleset>jetty/pmd_ruleset.xml</ruleset>
          </rulesets>
--- a/tests/test-sessions/test-hash-sessions/pom.xml
+++ b/tests/test-sessions/test-hash-sessions/pom.xml
@ -28,13 +28,6 @@
  <url>http://www.eclipse.org/jetty</url>
  <build>
    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-deploy-plugin</artifactId>
--- a/tests/test-sessions/test-jdbc-sessions/pom.xml
+++ b/tests/test-sessions/test-jdbc-sessions/pom.xml
@ -28,13 +28,6 @@
  <url>http://www.eclipse.org/jetty</url>
  <build>
    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-deploy-plugin</artifactId>
--- a/tests/test-sessions/test-mongodb-sessions/pom.xml
+++ b/tests/test-sessions/test-mongodb-sessions/pom.xml
@ -28,13 +28,6 @@
  <url>http://www.eclipse.org/jetty</url>
  <build>
    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-deploy-plugin</artifactId>
--- a/tests/test-webapps/test-mock-resources/pom.xml
+++ b/tests/test-webapps/test-mock-resources/pom.xml
@ -13,8 +13,6 @@
      <plugin>
        <artifactId>maven-compiler-plugin</artifactId>
        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
          <verbose>false</verbose>
        </configuration>
      </plugin>
--- a/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
+++ b/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
@ -13,8 +13,6 @@
       <plugin>
        <artifactId>maven-compiler-plugin</artifactId>
        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
          <verbose>false</verbose>
        </configuration>
       </plugin>
--- a/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
+++ b/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
@ -14,8 +14,6 @@
      <plugin>
        <artifactId>maven-compiler-plugin</artifactId>
        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
          <verbose>false</verbose>
        </configuration>
      </plugin>