Author: norman
Date: Mon Feb 28 06:37:56 2011
New Revision: 1075219
URL: http://svn.apache.org/viewvc?rev=1075219&view=rev
Log:
Fix HUPA build. Thanks to Felix Knecht for the patch. See HUPA-69
Added:
james/hupa/trunk/client/README.txt
james/hupa/trunk/client/src/main/java/com/
james/hupa/trunk/client/src/main/java/com/google/
james/hupa/trunk/client/src/main/java/com/google/gwt/
james/hupa/trunk/client/src/main/java/com/google/gwt/gen2/
james/hupa/trunk/client/src/main/java/com/google/gwt/gen2/event/
james/hupa/trunk/client/src/main/java/com/google/gwt/gen2/event/shared/
james/hupa/trunk/client/src/main/java/com/google/gwt/gen2/event/shared/HandlerManager.java
Modified:
james/hupa/trunk/client/src/main/webapp/WEB-INF/web.xml
james/hupa/trunk/client/war/WEB-INF/web.xml
james/hupa/trunk/pom.xml
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java
james/hupa/trunk/shared/src/site/site.xml
Added: james/hupa/trunk/client/README.txt
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/README.txt?rev=1075219&view=auto
==============================================================================
--- james/hupa/trunk/client/README.txt (added)
+++ james/hupa/trunk/client/README.txt Mon Feb 28 06:37:56 2011
@@ -0,0 +1,2 @@
+About the com.google.gwt.gen2.event.shared.HandlerManager:
+See http://code.google.com/p/google-web-toolkit-incubator/issues/detail?id=340
Added:
james/hupa/trunk/client/src/main/java/com/google/gwt/gen2/event/shared/HandlerManager.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/com/google/gwt/gen2/event/shared/HandlerManager.java?rev=1075219&view=auto
==============================================================================
---
james/hupa/trunk/client/src/main/java/com/google/gwt/gen2/event/shared/HandlerManager.java
(added)
+++
james/hupa/trunk/client/src/main/java/com/google/gwt/gen2/event/shared/HandlerManager.java
Mon Feb 28 06:37:56 2011
@@ -0,0 +1,188 @@
+/*
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed 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 com.google.gwt.gen2.event.shared;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.gen2.event.shared.AbstractEvent.Type;
+
+/**
+ * Manager responsible for adding handlers to event sources and firing those
+ * handlers on passed in events.
+ *
+ * @deprecated use the com.google.gwt.event.shared classes instead
+ */
+@Deprecated
+public class HandlerManager extends com.google.gwt.event.shared.HandlerManager
{
+ // Used to optimize the JavaScript handler container structure.
+ static int EXPECTED_HANDLERS = 5;
+
+ private static final boolean useJs = GWT.isScript();
+ private static int index = -EXPECTED_HANDLERS;
+
+ static int createKeyIndex() {
+ // Need to leave space for the size and the unflattened list if we end up
+ // needing it.
+ index += EXPECTED_HANDLERS + 2;
+ return index;
+ }
+
+ // Only one of JsHandlerRegistry and JavaHandlerRegistry are live at once.
+ private final JsHandlerRegistry javaScriptRegistry;
+ private final JavaHandlerRegistry javaRegistry;
+
+ //
+ private final Object source;
+
+ /**
+ * Creates a handler manager with the given source.
+ *
+ * @param source the event source
+ */
+ public HandlerManager(Object source) {
+ super(source);
+ if (useJs) {
+ javaScriptRegistry = JsHandlerRegistry.create();
+ javaRegistry = null;
+ } else {
+ javaRegistry = new JavaHandlerRegistry();
+ javaScriptRegistry = null;
+ }
+ this.source = source;
+ }
+
+ /**
+ * Adds a handle.
+ *
+ * @param <HandlerType> The type of handler.
+ * @param type the event type associated with this handler
+ * @param handler the handler
+ * @return the handler registration, can be stored in order to remove the
+ * handler later
+ */
+ public <HandlerType extends EventHandler> HandlerRegistration addHandler(
+ AbstractEvent.Type<?, HandlerType> type, final HandlerType handler) {
+ if (useJs) {
+ javaScriptRegistry.addHandler(type, handler);
+ } else {
+ javaRegistry.addHandler(type, handler);
+ }
+ return new HandlerRegistration(this, type, handler);
+ }
+
+ /**
+ * Clears all the handlers associated with the given type.
+ *
+ * @param type the type
+ */
+ public void clearHandlers(Type<?, ?> type) {
+ if (useJs) {
+ javaScriptRegistry.clearHandlers(type);
+ } else {
+ javaRegistry.clearHandlers(type);
+ }
+ }
+
+ /**
+ * Fires the given event to the handlers listening to the event's type.
+ *
+ * @param event the event
+ */
+ public void fireEvent(AbstractEvent event) {
+ Object oldSource = event.getSource();
+ event.setSource(source);
+ if (useJs) {
+ javaScriptRegistry.fireEvent(event);
+ } else {
+ javaRegistry.fireEvent(event);
+ }
+ if (oldSource == null) {
+ // This was my event, so I should kill it now that I'm done.
+ event.kill();
+ } else {
+ // Restoring the source for the next handler to use.
+ event.setSource(oldSource);
+ }
+ }
+
+ /**
+ * Gets the handler at the given index.
+ *
+ * @param <HandlerType> the event handler type
+ * @param index the index
+ * @param type the handler's event type
+ * @return the given handler
+ */
+ public <HandlerType extends EventHandler> HandlerType getHandler(
+ AbstractEvent.Type<?, HandlerType> type, int index) {
+ if (useJs) {
+ return (HandlerType) javaScriptRegistry.getHandler(type, index);
+ } else {
+ return (HandlerType) javaRegistry.getHandler(type, index);
+ }
+ }
+
+ /**
+ * Gets the number of handlers listening to the event type.
+ *
+ * @param type the event type
+ * @return the number of registered handlers
+ */
+ public int getHandlerCount(Type type) {
+ if (useJs) {
+ return javaScriptRegistry.getHandlerCount(type);
+ } else {
+ return javaRegistry.getHandlerCount(type);
+ }
+ }
+
+ /**
+ * Gets the source for events fired from this manager.
+ *
+ * @return the source
+ */
+ public Object getSource() {
+ return source;
+ }
+
+ /**
+ * Are there handlers in this manager listening to the given event type?
+ *
+ * @param type the event type
+ * @return are handlers listening on the given event type
+ */
+ public boolean isEventHandled(Type type) {
+ return getHandlerCount(type) > 0;
+ }
+
+ /**
+ * Removes the given handler from the specified event type. Normally,
+ * applications should call {@link HandlerRegistration#removeHandler()}
+ * instead. This method is provided primary to support deprecated APIS.
+ *
+ * @param <HandlerType> handler type
+ *
+ * @param type the event type
+ * @param handler the handler
+ */
+ public <HandlerType extends EventHandler> void removeHandler(
+ AbstractEvent.Type<?, HandlerType> type, final HandlerType handler) {
+ if (useJs) {
+ javaScriptRegistry.removeHandler(type, handler);
+ } else {
+ javaRegistry.removeHandler(type, handler);
+ }
+ }
+}
Modified: james/hupa/trunk/client/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/webapp/WEB-INF/web.xml?rev=1075219&r1=1075218&r2=1075219&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/webapp/WEB-INF/web.xml (original)
+++ james/hupa/trunk/client/src/main/webapp/WEB-INF/web.xml Mon Feb 28 06:37:56
2011
@@ -5,11 +5,6 @@
<web-app>
- <!-- Default page to serve -->
- <welcome-file-list>
- <welcome-file>Hupa.html</welcome-file>
- </welcome-file-list>
-
<!-- Max size of the upload request (10MB) -->
<context-param>
<param-name>maxSize</param-name>
@@ -23,6 +18,20 @@
</context-param>
-->
+ <filter>
+ <filter-name>guiceFilter</filter-name>
+ <filter-class>com.google.inject.servlet.GuiceFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>guiceFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <listener>
+
<listener-class>org.apache.hupa.server.guice.GuiceServletConfig</listener-class>
+ </listener>
+
<!-- servlet for incubator gwt stuff -->
<servlet>
<servlet-name>remoteLoggingService</servlet-name>
@@ -34,17 +43,9 @@
<url-pattern>/hupa/logging</url-pattern>
</servlet-mapping>
- <filter>
- <filter-name>guiceFilter</filter-name>
-
<filter-class>com.google.inject.servlet.GuiceFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>guiceFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- <listener>
-
<listener-class>org.apache.hupa.server.guice.GuiceServletConfig</listener-class>
- </listener>
+ <!-- Default page to serve -->
+ <welcome-file-list>
+ <welcome-file>Hupa.html</welcome-file>
+ </welcome-file-list>
+
</web-app>
Modified: james/hupa/trunk/client/war/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/war/WEB-INF/web.xml?rev=1075219&r1=1075218&r2=1075219&view=diff
==============================================================================
--- james/hupa/trunk/client/war/WEB-INF/web.xml (original)
+++ james/hupa/trunk/client/war/WEB-INF/web.xml Mon Feb 28 06:37:56 2011
@@ -5,11 +5,6 @@
<web-app>
- <!-- Default page to serve -->
- <welcome-file-list>
- <welcome-file>Hupa.html</welcome-file>
- </welcome-file-list>
-
<!-- Max size of the upload request (10MB) -->
<context-param>
<param-name>maxSize</param-name>
@@ -23,6 +18,20 @@
</context-param>
-->
+ <filter>
+ <filter-name>guiceFilter</filter-name>
+ <filter-class>com.google.inject.servlet.GuiceFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>guiceFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <listener>
+
<listener-class>org.apache.hupa.server.guice.GuiceServletConfig</listener-class>
+ </listener>
+
<!-- servlet for incubator gwt stuff -->
<servlet>
<servlet-name>remoteLoggingService</servlet-name>
@@ -34,17 +43,9 @@
<url-pattern>/hupa/logging</url-pattern>
</servlet-mapping>
- <filter>
- <filter-name>guiceFilter</filter-name>
-
<filter-class>com.google.inject.servlet.GuiceFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>guiceFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- <listener>
-
<listener-class>org.apache.hupa.server.guice.GuiceServletConfig</listener-class>
- </listener>
+ <!-- Default page to serve -->
+ <welcome-file-list>
+ <welcome-file>Hupa.html</welcome-file>
+ </welcome-file-list>
+
</web-app>
Modified: james/hupa/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/pom.xml?rev=1075219&r1=1075218&r2=1075219&view=diff
==============================================================================
--- james/hupa/trunk/pom.xml (original)
+++ james/hupa/trunk/pom.xml Mon Feb 28 06:37:56 2011
@@ -31,9 +31,13 @@
<parent>
<groupId>org.apache.james</groupId>
<artifactId>james-project</artifactId>
- <version>1.3</version>
+ <version>1.5</version>
</parent>
+ <prerequisites>
+ <maven>3.0.2</maven>
+ </prerequisites>
+
<modules>
<module>shared</module>
<module>client</module>
@@ -66,10 +70,6 @@
<repositories>
<repository>
- <id>maven-repos</id>
- <url>http://repo2.maven.org/maven2/</url>
- </repository>
- <repository>
<id>maven2-repository.dev.java.net</id>
<name>Java.net Repository for Maven</name>
<url>http://download.java.net/maven/2/
@@ -119,33 +119,33 @@
</repository>
</repositories>
<properties>
- <gwtVersion>2.0.3</gwtVersion>
+ <gwtVersion>2.1.1</gwtVersion>
</properties>
<build>
<pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-7</version>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
+ <version>3.0-beta-3</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
<configuration>
- <targetjdk>1.4</targetjdk>
+ <targetJdk>1.5</targetJdk>
<rulesets>
<ruleset>/rulesets/basic.xml</ruleset>
<ruleset>/rulesets/controversial.xml</ruleset>
@@ -162,12 +162,14 @@
<version>1.0-alpha-3</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
+ <version>2.3.1</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.3.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -175,16 +177,19 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.7.2</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.7.2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -200,8 +205,194 @@
</filters>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>gwt-maven-plugin</artifactId>
+ <version>2.1.0-1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1.1</version>
+ </plugin>
</plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.0-beta-3</version>
+ <configuration>
+ <reportPlugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.3.1</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>cim</report>
+ <report>dependencies</report>
+ <report>dependency-convergence</report>
+ <report>dependency-management</report>
+
<report>distribution-management</report>
+ <report>help</report>
+ <report>index</report>
+ <report>issue-tracking</report>
+ <report>license</report>
+ <report>mailing-list</report>
+ <report>modules</report>
+ <report>plugin-management</report>
+ <report>plugins</report>
+ <report>project-team</report>
+ <report>scm</report>
+ <report>summary</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <linkXref>true</linkXref>
+ <sourceEncoding>utf-8</sourceEncoding>
+ <minimumTokens>100</minimumTokens>
+ <targetJdk>1.5</targetJdk>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <argLine>-Xmx1024m
-XX:MaxPermSize=512m</argLine>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <excludes>
+ <!-- MAVEN_DEFAULT_EXCLUDES -->
+ <exclude>**/target/**/*</exclude>
+ <exclude>**/cobertura.ser</exclude>
+ <!-- ECLIPSE_DEFAULT_EXCLUDES -->
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**/*</exclude>
+ <!-- IDEA_DEFAULT_EXCLUDES -->
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+ <!-- MANIFEST_MF_EXCLUDES -->
+ <exclude>**/MANIFEST.MF</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>versions-maven-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+
<report>dependency-updates-report</report>
+ <report>plugin-updates-report</report>
+
<report>property-updates-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <configuration>
+
<xrefLocation>${project.reporting.outputDirectory}/../xref</xrefLocation>
+
<xrefTestLocation>${project.reporting.outputDirectory}/../xref-test</xrefTestLocation>
+ <!-- required by dashboard plugin and hudson
-->
+ <xmlOutput>true</xmlOutput>
+ <effort>Max</effort>
+ <findbugsXmlOutput>true</findbugsXmlOutput>
+
<findbugsXmlWithMessages>true</findbugsXmlWithMessages>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>versions-maven-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+
<report>dependency-updates-report</report>
+ <report>plugin-updates-report</report>
+
<report>property-updates-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <configuration>
+ <instrumentation>
+ <excludes>
+ </excludes>
+ </instrumentation>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.7</version>
+ <configuration>
+ <minmemory>512m</minmemory>
+ <maxmemory>1g</maxmemory>
+ <linksource>true</linksource>
+ <tags>
+ <tag>
+ <name>note</name>
+ <placement>a</placement>
+ <head>NOTE</head>
+ </tag>
+ <tag>
+ <name>todo</name>
+ <placement>a</placement>
+ <head>TODO</head>
+ </tag>
+ <tag>
+ <name>warning</name>
+ <placement>a</placement>
+ <head>WARNING</head>
+ </tag>
+ </tags>
+ <source>1.5</source>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>aggregate</report>
+ <report>test-aggregate</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dashboard-maven-plugin</artifactId>
+ </plugin>
+ </reportPlugins>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<dependencyManagement>
<dependencies>
@@ -248,7 +439,7 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>1.4.1</version>
+ <version>1.4.4</version>
</dependency>
<dependency>
<groupId>org.cobogw.gwt</groupId>
@@ -256,34 +447,31 @@
<version>1.3</version>
</dependency>
<dependency>
- <groupId>net.customware.gwt.dispatch
- </groupId>
+ <groupId>net.customware.gwt.dispatch</groupId>
<artifactId>gwt-dispatch</artifactId>
<version>1.0.0</version>
<exclusions>
- <exclusion>
- <groupId>com.google.gwt.inject</groupId>
- <artifactId>gin</artifactId>
- </exclusion>
- </exclusions>
+ <exclusion>
+ <groupId>com.google.gwt.inject</groupId>
+ <artifactId>gin</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>com.googlecode.gwt.inject
- </groupId>
+ <groupId>com.googlecode.gwt.inject</groupId>
<artifactId>gin</artifactId>
<version>1.0</version>
</dependency>
<dependency>
- <groupId>net.customware.gwt.presenter
- </groupId>
+ <groupId>net.customware.gwt.presenter</groupId>
<artifactId>gwt-presenter</artifactId>
<version>1.1.0-replace-SNAPSHOT</version>
<exclusions>
- <exclusion>
- <groupId>com.google.gwt.inject</groupId>
- <artifactId>gin</artifactId>
- </exclusion>
- </exclusions>
+ <exclusion>
+ <groupId>com.google.gwt.inject</groupId>
+ <artifactId>gin</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
@@ -313,17 +501,17 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
+ <version>2.0.1</version>
</dependency>
<dependency>
<groupId>com.google.code.guice</groupId>
<artifactId>guice</artifactId>
- <version>2.0</version>
+ <version>2.0.1</version>
</dependency>
<dependency>
<groupId>com.google.code.guice</groupId>
<artifactId>guice-servlet</artifactId>
- <version>2.0</version>
+ <version>2.0.1</version>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
@@ -346,13 +534,13 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.1</version>
+ <version>4.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.5.2</version>
+ <version>3.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java?rev=1075219&r1=1075218&r2=1075219&view=diff
==============================================================================
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java
Mon Feb 28 06:37:56 2011
@@ -48,7 +48,7 @@ public class MockIMAPFolder extends IMAP
private boolean exists;
public MockIMAPFolder(String fullName, IMAPStore store) {
- super(fullName,
(DemoModeConstants.DEMO_MODE_DEFAULT_FOLDER.equals(fullName) ? '\0' :
SEPARATOR), store);
+ super(fullName,
(DemoModeConstants.DEMO_MODE_DEFAULT_FOLDER.equals(fullName) ? '\0' :
SEPARATOR), store, false);
}
@Override
@@ -345,7 +345,8 @@ public class MockIMAPFolder extends IMAP
return ret;
}
- private void checkExists() throws MessagingException {
+ @Override
+ protected void checkExists() throws MessagingException {
if (exists() == false) {
throw new MessagingException("Folder not exists");
}
Modified: james/hupa/trunk/shared/src/site/site.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/site/site.xml?rev=1075219&r1=1075218&r2=1075219&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/site/site.xml (original)
+++ james/hupa/trunk/shared/src/site/site.xml Mon Feb 28 06:37:56 2011
@@ -19,8 +19,6 @@
-->
<project name="Hupa">
<body>
- <!-- This is a "dummy" site because of this bug: -->
- <!-- http://jira.codehaus.org/browse/MSITE-345 -->
<menu ref="parent"/>
<menu ref="reports"/>
</body>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
