Merge branch 'master' of ssh://vgulevich@git.eclipse.org:29418/rcptt/org.eclipse.rcptt.git
diff --git a/core/org.eclipse.rcptt.util/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.util/META-INF/MANIFEST.MF
index 5da221b..1f8ad60 100644
--- a/core/org.eclipse.rcptt.util/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.util/META-INF/MANIFEST.MF
@@ -7,7 +7,6 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.eclipse.rcptt.util
Require-Bundle: org.eclipse.core.runtime,
- org.jsoup;resolution:=optional,
- javax.servlet
+ org.jsoup;resolution:=optional
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.rcptt.util.UtilPlugin
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.swt.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.swt.rap/META-INF/MANIFEST.MF
index 63bffd9..4265f3d 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.swt.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.swt.rap/META-INF/MANIFEST.MF
@@ -12,6 +12,7 @@
org.eclipse.rcptt.tesla.core;bundle-version="[2.2.0,3.0.0)",
org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.2.0,3.0.0)",
org.eclipse.rap.rwt.osgi,
+ org.eclipse.rcptt.tesla.swt.aspects.rap,
javax.servlet
onEnvironment: JavaSE-1.7
Import-Package: org.eclipse.rcptt.util,
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.swt.rap/src/org/eclipse/rcptt/tesla/recording/aspects/swt/rap/ServiceHandlerWrapper.java b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.swt.rap/src/org/eclipse/rcptt/tesla/recording/aspects/swt/rap/ServiceHandlerWrapper.java
index e779e77..724fd7c 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.swt.rap/src/org/eclipse/rcptt/tesla/recording/aspects/swt/rap/ServiceHandlerWrapper.java
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.swt.rap/src/org/eclipse/rcptt/tesla/recording/aspects/swt/rap/ServiceHandlerWrapper.java
@@ -19,8 +19,8 @@
import javax.servlet.http.HttpServletResponse;
import org.eclipse.rap.rwt.service.ServiceHandler;
+import org.eclipse.rcptt.tesla.swt.download.OutputStreamResponseWrapper;
import org.eclipse.rcptt.util.Base64;
-import org.eclipse.rcptt.util.OutputStreamResponseWrapper;
public class ServiceHandlerWrapper implements ServiceHandler {
diff --git a/core/org.eclipse.rcptt.util/src/org/eclipse/rcptt/util/MockHttpServletRequest.java b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects.rap/src/org/eclipse/rcptt/tesla/swt/download/MockHttpServletRequest.java
similarity index 99%
rename from core/org.eclipse.rcptt.util/src/org/eclipse/rcptt/util/MockHttpServletRequest.java
rename to modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects.rap/src/org/eclipse/rcptt/tesla/swt/download/MockHttpServletRequest.java
index 1048af3..20970ba 100644
--- a/core/org.eclipse.rcptt.util/src/org/eclipse/rcptt/util/MockHttpServletRequest.java
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects.rap/src/org/eclipse/rcptt/tesla/swt/download/MockHttpServletRequest.java
@@ -9,7 +9,7 @@
* Xored Software Inc - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.rcptt.util;
+package org.eclipse.rcptt.tesla.swt.download;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
diff --git a/core/org.eclipse.rcptt.util/src/org/eclipse/rcptt/util/MockHttpServletResponse.java b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects.rap/src/org/eclipse/rcptt/tesla/swt/download/MockHttpServletResponse.java
similarity index 98%
rename from core/org.eclipse.rcptt.util/src/org/eclipse/rcptt/util/MockHttpServletResponse.java
rename to modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects.rap/src/org/eclipse/rcptt/tesla/swt/download/MockHttpServletResponse.java
index 30c1d0a..ffa85ed 100644
--- a/core/org.eclipse.rcptt.util/src/org/eclipse/rcptt/util/MockHttpServletResponse.java
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects.rap/src/org/eclipse/rcptt/tesla/swt/download/MockHttpServletResponse.java
@@ -8,7 +8,7 @@
* Contributors:
* Xored Software Inc - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.rcptt.util;
+package org.eclipse.rcptt.tesla.swt.download;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
diff --git a/core/org.eclipse.rcptt.util/src/org/eclipse/rcptt/util/OutputStreamResponseWrapper.java b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects.rap/src/org/eclipse/rcptt/tesla/swt/download/OutputStreamResponseWrapper.java
similarity index 97%
rename from core/org.eclipse.rcptt.util/src/org/eclipse/rcptt/util/OutputStreamResponseWrapper.java
rename to modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects.rap/src/org/eclipse/rcptt/tesla/swt/download/OutputStreamResponseWrapper.java
index 0f4cc1b..925402e 100644
--- a/core/org.eclipse.rcptt.util/src/org/eclipse/rcptt/util/OutputStreamResponseWrapper.java
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects.rap/src/org/eclipse/rcptt/tesla/swt/download/OutputStreamResponseWrapper.java
@@ -8,7 +8,7 @@
* Contributors:
* Xored Software Inc - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.rcptt.util;
+package org.eclipse.rcptt.tesla.swt.download;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects.rap/src/org/eclipse/rcptt/tesla/swt/download/RapDownloadHandlerManager.java b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects.rap/src/org/eclipse/rcptt/tesla/swt/download/RapDownloadHandlerManager.java
index 193d5c0..8ede2b0 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects.rap/src/org/eclipse/rcptt/tesla/swt/download/RapDownloadHandlerManager.java
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects.rap/src/org/eclipse/rcptt/tesla/swt/download/RapDownloadHandlerManager.java
@@ -21,8 +21,6 @@
import org.eclipse.rap.rwt.internal.service.ServiceManagerImpl;
import org.eclipse.rap.rwt.service.ServiceHandler;
import org.eclipse.rcptt.tesla.swt.aspects.rap.SWTAspectActivator;
-import org.eclipse.rcptt.util.MockHttpServletRequest;
-import org.eclipse.rcptt.util.MockHttpServletResponse;
public class RapDownloadHandlerManager {
diff --git a/core/org.eclipse.rcptt.util/src/org/eclipse/rcptt/util/ServletOutputStreamWrapper.java b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects.rap/src/org/eclipse/rcptt/tesla/swt/download/ServletOutputStreamWrapper.java
similarity index 97%
rename from core/org.eclipse.rcptt.util/src/org/eclipse/rcptt/util/ServletOutputStreamWrapper.java
rename to modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects.rap/src/org/eclipse/rcptt/tesla/swt/download/ServletOutputStreamWrapper.java
index 3df7ccb..8a75f7c 100644
--- a/core/org.eclipse.rcptt.util/src/org/eclipse/rcptt/util/ServletOutputStreamWrapper.java
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects.rap/src/org/eclipse/rcptt/tesla/swt/download/ServletOutputStreamWrapper.java
@@ -8,7 +8,7 @@
* Contributors:
* Xored Software Inc - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.rcptt.util;
+package org.eclipse.rcptt.tesla.swt.download;
import java.io.IOException;
import java.io.OutputStream;
diff --git a/releng/pom.xml b/releng/pom.xml
index 426eab2..75a3a6b 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -24,9 +24,9 @@
<signExcludeInnerJars>true</signExcludeInnerJars>
<aspectj_version>1.7</aspectj_version>
<aspectj_dep>1.7.0</aspectj_dep>
- <ajJavaSource>1.5</ajJavaSource>
- <ajJavaTarget>1.5</ajJavaTarget>
- <ajJavaCompilance>1.5</ajJavaCompilance>
+ <ajJavaSource>1.7</ajJavaSource>
+ <ajJavaTarget>1.7</ajJavaTarget>
+ <ajJavaCompilance>1.7</ajJavaCompilance>
</properties>
<distributionManagement>
<repository>
