Author: [email protected]
Date: Mon Oct 24 15:34:27 2011
New Revision: 1578
Log:
[AMDATUOPENSOCIAL-124] Upgrade to 0.2.1
Modified:
trunk/amdatu-opensocial/opensocial-dashboard/pom.xml
trunk/amdatu-opensocial/opensocial-profile/src/main/java/org/amdatu/opensocial/profile/service/TenantHostnameDispatchExtenderFilter.java
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/service/TenantHostnameDispatchExtenderFilter.java
trunk/amdatu-opensocial/opensocial-stores/mem-store-gadget/pom.xml
trunk/amdatu-opensocial/pom.xml
trunk/amdatu-opensocial/test-integration/pom.xml
trunk/amdatu-opensocial/test-performance/pom.xml
Modified: trunk/amdatu-opensocial/opensocial-dashboard/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/opensocial-dashboard/pom.xml (original)
+++ trunk/amdatu-opensocial/opensocial-dashboard/pom.xml Mon Oct 24
15:34:27 2011
@@ -31,7 +31,6 @@
<dependency>
<groupId>org.amdatu.opensocial</groupId>
<artifactId>org.amdatu.opensocial.dashboardplugin</artifactId>
- <version>0.2.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
Modified:
trunk/amdatu-opensocial/opensocial-profile/src/main/java/org/amdatu/opensocial/profile/service/TenantHostnameDispatchExtenderFilter.java
==============================================================================
---
trunk/amdatu-opensocial/opensocial-profile/src/main/java/org/amdatu/opensocial/profile/service/TenantHostnameDispatchExtenderFilter.java
(original)
+++
trunk/amdatu-opensocial/opensocial-profile/src/main/java/org/amdatu/opensocial/profile/service/TenantHostnameDispatchExtenderFilter.java
Mon Oct 24 15:34:27 2011
@@ -25,6 +25,7 @@
import org.amdatu.core.tenant.Tenant;
import org.amdatu.web.dispatcher.DispatchExtenderFilter;
+import org.amdatu.web.dispatcher.DispatcherService;
import
org.amdatu.web.tenantresolver.hostname.service.HostnameTenantResolverExtenderFilter;
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
@@ -54,7 +55,7 @@
public void doFilter(final ServletRequest request, final ServletResponse
response, final FilterChain chain)
throws IOException, ServletException {
try {
- Object tenant =
request.getAttribute(HostnameTenantResolverExtenderFilter.TENANT_REQUESTCONTEXT_KEY);
+ Object tenant =
request.getAttribute(DispatcherService.TENANT_REQUESTCONTEXT_KEY);
if (tenant != null && tenant instanceof Tenant) {
PROPERTIES.set((Tenant) tenant);
}
Modified:
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/service/TenantHostnameDispatchExtenderFilter.java
==============================================================================
---
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/service/TenantHostnameDispatchExtenderFilter.java
(original)
+++
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/service/TenantHostnameDispatchExtenderFilter.java
Mon Oct 24 15:34:27 2011
@@ -25,7 +25,7 @@
import org.amdatu.core.tenant.Tenant;
import org.amdatu.web.dispatcher.DispatchExtenderFilter;
-import
org.amdatu.web.tenantresolver.hostname.service.HostnameTenantResolverExtenderFilter;
+import org.amdatu.web.dispatcher.DispatcherService;
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
@@ -55,7 +55,7 @@
public void doFilter(final ServletRequest request, final ServletResponse
response, final FilterChain chain)
throws IOException, ServletException {
try {
- Object tenant =
request.getAttribute(HostnameTenantResolverExtenderFilter.TENANT_REQUESTCONTEXT_KEY);
+ Object tenant =
request.getAttribute(DispatcherService.TENANT_REQUESTCONTEXT_KEY);
if (tenant != null && tenant instanceof Tenant) {
PROPERTIES.set((Tenant) tenant);
}
Modified: trunk/amdatu-opensocial/opensocial-stores/mem-store-gadget/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/opensocial-stores/mem-store-gadget/pom.xml
(original)
+++ trunk/amdatu-opensocial/opensocial-stores/mem-store-gadget/pom.xml Mon Oct
24 15:34:27 2011
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.amdatu.opensocial</groupId>
<artifactId>org.amdatu.opensocial.gadgetmanagement</artifactId>
- <version>0.2.0-SNAPSHOT</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
Modified: trunk/amdatu-opensocial/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/pom.xml (original)
+++ trunk/amdatu-opensocial/pom.xml Mon Oct 24 15:34:27 2011
@@ -17,10 +17,10 @@
<properties>
<!-- Version of dependend components -->
- <amdatu.core.version>0.2.0</amdatu.core.version>
- <amdatu.web.version>0.2.0</amdatu.web.version>
- <amdatu.auth.version>0.2.0-SNAPSHOT</amdatu.auth.version>
- <amdatu.libraries.version>0.2.0</amdatu.libraries.version>
+ <amdatu.core.version>0.2.1</amdatu.core.version>
+ <amdatu.web.version>0.2.1</amdatu.web.version>
+ <amdatu.auth.version>0.2.0</amdatu.auth.version>
+ <amdatu.libraries.version>0.2.1</amdatu.libraries.version>
<javax.servlet.version>2.5</javax.servlet.version>
</properties>
@@ -93,6 +93,13 @@
<!-- Internal project dependencies -->
<dependency>
<groupId>org.amdatu.opensocial</groupId>
+ <artifactId>org.amdatu.opensocial.dashboardplugin</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.opensocial</groupId>
<artifactId>org.amdatu.opensocial.dashboard</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
Modified: trunk/amdatu-opensocial/test-integration/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/test-integration/pom.xml (original)
+++ trunk/amdatu-opensocial/test-integration/pom.xml Mon Oct 24 15:34:27 2011
@@ -28,9 +28,9 @@
<name>Amdatu OpenSocial - Integration Tests reactor</name>
<properties>
- <org.amdatu.core.version>0.2.1-SNAPSHOT</org.amdatu.core.version>
- <org.amdatu.web.version>0.2.1-SNAPSHOT</org.amdatu.web.version>
- <org.amdatu.auth.version>0.2.0-RC1</org.amdatu.auth.version>
+ <org.amdatu.core.version>0.2.1</org.amdatu.core.version>
+ <org.amdatu.web.version>0.2.1</org.amdatu.web.version>
+ <org.amdatu.auth.version>0.2.0</org.amdatu.auth.version>
<org.apache.felix.http.version>2.2.0</org.apache.felix.http.version>
</properties>
@@ -41,20 +41,6 @@
<dependencyManagement>
<dependencies>
- <!-- FIXME: this is a temporary dependency, needed to overrule the
default
- dependency with the 0.2.0 version of this artifact. Since 0.2.0 does
- not yet contain the integration test framework, this integration
test
- depends on 0.2.1-SNAPSHOT instead. This depedency should be removed
as
- soon as the core dependecies in the integration test are in line
with
- the core dependencies version defined in the amdatu-opensocial root
pom-->
- <dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.config.templates</artifactId>
- <version>${org.amdatu.core.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
-
<!--
Amdatu core and web itest base is crosscutting to both the base and
tests
module. This brings in the all dependencies required to work with
Modified: trunk/amdatu-opensocial/test-performance/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/test-performance/pom.xml (original)
+++ trunk/amdatu-opensocial/test-performance/pom.xml Mon Oct 24 15:34:27 2011
@@ -12,7 +12,7 @@
<description>This bundle generates the Performance Test framework for the
OpenSocial project</description>
<properties>
- <test.performance.version>0.2.0-SNAPSHOT</test.performance.version>
+ <test.performance.version>0.2.0</test.performance.version>
</properties>
<dependencies>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
