Skip to content
Browse files

Fixed Version 2.0.6 issues of the sling API.

  • Loading branch information...
1 parent a08fa1f commit 7edc787254bbe575bb517d254d6d2a8a2f16878c @ieb ieb committed Sep 15, 2009
View
2 slingtests/osgikernel/app-bundles/pom.xml
@@ -258,7 +258,7 @@
<dependency>
<groupId>org.sakaiproject.kernel</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.0.5-sakai-SNAPSHOT</version>
+ <version>2.0.6-sakai-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.sakaiproject.kernel</groupId>
View
2 slingtests/osgikernel/bundles/activity/pom.xml
@@ -119,4 +119,4 @@
<version>0.9.0</version>
</dependency>
</dependencies>
-</project>
+</project>
View
4 slingtests/osgikernel/bundles/connections/pom.xml
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.sakaiproject.kernel</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.0.5-sakai-SNAPSHOT</version>
+ <version>2.0.6-sakai-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!-- servlet -->
@@ -168,4 +168,4 @@
<scope>provided</scope>
</dependency>
</dependencies>
-</project>
+</project>
View
4 slingtests/osgikernel/bundles/discussion/pom.xml
@@ -122,7 +122,7 @@
<dependency>
<groupId>org.sakaiproject.kernel</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.0.5-sakai-SNAPSHOT</version>
+ <version>2.0.6-sakai-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!-- servlet -->
@@ -184,4 +184,4 @@
<scope>provided</scope>
</dependency>
</dependencies>
-</project>
+</project>
View
2 slingtests/osgikernel/bundles/personal/pom.xml
@@ -106,4 +106,4 @@
<scope>provided</scope>
</dependency>
</dependencies>
-</project>
+</project>
View
4 ...nel/bundles/proxy/src/main/java/org/sakaiproject/kernel/proxy/ProxyClientServiceImpl.java
@@ -110,7 +110,7 @@
* @param ctx
* @throws Exception
*/
- protected void activate(ComponentContext ctx) throws Exception {
+ public void activate(ComponentContext ctx) throws Exception {
velocityEngine = new VelocityEngine();
velocityEngine.setProperty(VelocityEngine.RUNTIME_LOG_LOGSYSTEM, new VelocityLogger(
this.getClass()));
@@ -138,7 +138,7 @@ protected void activate(ComponentContext ctx) throws Exception {
* @param ctx
* @throws Exception
*/
- protected void deactivate(ComponentContext ctx) throws Exception {
+ public void deactivate(ComponentContext ctx) throws Exception {
httpClientConnectionManager.shutdown();
}
View
4 slingtests/osgikernel/bundles/sling/api/pom.xml
@@ -20,7 +20,7 @@
</parent>
<artifactId>org.apache.sling.api</artifactId>
<packaging>jar</packaging>
- <version>2.0.5-sakai-SNAPSHOT</version>
+ <version>2.0.6-sakai-SNAPSHOT</version>
<name>Sakai Kernel Sling API Extension Bundle</name>
<description>Extension bundle that provides additional functionality in the Sling API
area as required by Sakai.</description>
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.0.5-SNAPSHOT</version>
+ <version>2.0.6</version>
<scope>compile</scope>
</dependency>
<dependency>
View
2 slingtests/osgikernel/bundles/sling/resource/pom.xml
@@ -63,7 +63,7 @@
<dependency>
<groupId>org.sakaiproject.kernel</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.0.5-sakai-SNAPSHOT</version>
+ <version>2.0.6-sakai-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
View
2 slingtests/osgikernel/bundles/uxloader/pom.xml
@@ -40,6 +40,7 @@
</instructions>
</configuration>
</plugin>
+<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-plugin</artifactId>
@@ -95,6 +96,7 @@
</execution>
</executions>
</plugin>
+-->
</plugins>
</build>
</project>

0 comments on commit 7edc787

Please sign in to comment.
Something went wrong with that request. Please try again.