Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B4BCCF64C for ; Tue, 2 Apr 2013 15:07:18 +0000 (UTC) Received: (qmail 8292 invoked by uid 500); 2 Apr 2013 15:07:18 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 7649 invoked by uid 500); 2 Apr 2013 15:07:15 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 7605 invoked by uid 99); 2 Apr 2013 15:07:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Apr 2013 15:07:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Apr 2013 15:07:13 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id F131523889BB; Tue, 2 Apr 2013 15:06:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1463585 - in /sling/trunk: ./ launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ launchpad/test-bundles/src/main/bundles/ launchpad/test-fragment/ launchpad/test-fragment/src/ launchpad/test-fragme... Date: Tue, 02 Apr 2013 15:06:52 -0000 To: commits@sling.apache.org From: bdelacretaz@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130402150652.F131523889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bdelacretaz Date: Tue Apr 2 15:06:52 2013 New Revision: 1463585 URL: http://svn.apache.org/r1463585 Log: SLING-2808 - test packages exported from a fragment bundle, disabled for now Added: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ExportedPackagesTest.java sling/trunk/launchpad/test-fragment/ (with props) sling/trunk/launchpad/test-fragment/pom.xml sling/trunk/launchpad/test-fragment/src/ sling/trunk/launchpad/test-fragment/src/main/ sling/trunk/launchpad/test-fragment/src/main/java/ sling/trunk/launchpad/test-fragment/src/main/java/org/ sling/trunk/launchpad/test-fragment/src/main/java/org/apache/ sling/trunk/launchpad/test-fragment/src/main/java/org/apache/sling/ sling/trunk/launchpad/test-fragment/src/main/java/org/apache/sling/launchpad/ sling/trunk/launchpad/test-fragment/src/main/java/org/apache/sling/launchpad/testservices/ sling/trunk/launchpad/test-fragment/src/main/java/org/apache/sling/launchpad/testservices/fragment/ sling/trunk/launchpad/test-fragment/src/main/java/org/apache/sling/launchpad/testservices/fragment/testpackage/ sling/trunk/launchpad/test-fragment/src/main/java/org/apache/sling/launchpad/testservices/fragment/testpackage/ClassFromFragment.java sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/ExportedPackageServlet.java Modified: sling/trunk/launchpad/test-bundles/src/main/bundles/list.xml sling/trunk/pom.xml Added: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ExportedPackagesTest.java URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ExportedPackagesTest.java?rev=1463585&view=auto ============================================================================== --- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ExportedPackagesTest.java (added) +++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ExportedPackagesTest.java Tue Apr 2 15:06:52 2013 @@ -0,0 +1,42 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with this + * work for additional information regarding copyright ownership. The ASF + * licenses this file to You 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 org.apache.sling.launchpad.webapp.integrationtest; + +import org.apache.sling.commons.testing.integration.HttpTestBase; + +public class ExportedPackagesTest extends HttpTestBase { + + private void assertExported(String pack) throws Exception { + final String content = getContent(HTTP_BASE_URL + "/.EXPORTED_PACKAGES.txt?package=" + pack, CONTENT_TYPE_PLAIN); + final String marker = "PACKAGE FOUND:"; + assertTrue("Expecting '" + marker + "' in content '" + content + "'", content.contains(marker)); + assertTrue("Expecting '" + pack + "' in content '" + content + "'", content.contains(pack)); + } + + public void testSlingApiPackage() throws Exception { + assertExported("org.apache.sling.api"); + } + + public void testPackageFromTestServices() throws Exception { + assertExported("org.apache.sling.launchpad.testservices.exported"); + } + + /** TODO fails due to SLING-2808 */ + public void DISABLED_testPackageFromFragment() throws Exception { + assertExported("org.apache.sling.launchpad.testservices.fragment.testpackage"); + } +} Modified: sling/trunk/launchpad/test-bundles/src/main/bundles/list.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-bundles/src/main/bundles/list.xml?rev=1463585&r1=1463584&r2=1463585&view=diff ============================================================================== --- sling/trunk/launchpad/test-bundles/src/main/bundles/list.xml (original) +++ sling/trunk/launchpad/test-bundles/src/main/bundles/list.xml Tue Apr 2 15:06:52 2013 @@ -48,6 +48,11 @@ org.apache.sling + org.apache.sling.launchpad.test-fragment + 2.0.9-SNAPSHOT + + + org.apache.sling org.apache.sling.launchpad.test-services-war 2.0.8 war Propchange: sling/trunk/launchpad/test-fragment/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Apr 2 15:06:52 2013 @@ -0,0 +1,17 @@ +target +sling +bin +logs +jackrabbit-repository +derby.log +*.iml +*.ipr +*.iws +.settings +.project +.classpath +.externalToolBuilders +maven-eclipse.xml +cachedir + + Added: sling/trunk/launchpad/test-fragment/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-fragment/pom.xml?rev=1463585&view=auto ============================================================================== --- sling/trunk/launchpad/test-fragment/pom.xml (added) +++ sling/trunk/launchpad/test-fragment/pom.xml Tue Apr 2 15:06:52 2013 @@ -0,0 +1,71 @@ + + + + + 4.0.0 + + org.apache.sling + sling + 15 + ../../parent/pom.xml + + + org.apache.sling.launchpad.test-fragment + bundle + 2.0.9-SNAPSHOT + + Apache Sling Launchpad Testing Fragment Bundle + + Sling fragment bundle used by the Launchpad Testing integration tests + + + + scm:svn:http://svn.apache.org/repos/asf/sling/trunk/launchpad/test-fragment + scm:svn:https://svn.apache.org/repos/asf/sling/trunk/launchpad/test-fragment + http://svn.apache.org/viewvc/sling/trunk/launchpad/test-fragment + + + + + + org.apache.felix + maven-scr-plugin + + + org.apache.felix + maven-bundle-plugin + true + + + + org.apache.sling.launchpad.testservices.fragment.* + + + org.apache.sling.launchpad.testservices.* + + + org.apache.sling.launchpad.test-services + + + + + + + Added: sling/trunk/launchpad/test-fragment/src/main/java/org/apache/sling/launchpad/testservices/fragment/testpackage/ClassFromFragment.java URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-fragment/src/main/java/org/apache/sling/launchpad/testservices/fragment/testpackage/ClassFromFragment.java?rev=1463585&view=auto ============================================================================== --- sling/trunk/launchpad/test-fragment/src/main/java/org/apache/sling/launchpad/testservices/fragment/testpackage/ClassFromFragment.java (added) +++ sling/trunk/launchpad/test-fragment/src/main/java/org/apache/sling/launchpad/testservices/fragment/testpackage/ClassFromFragment.java Tue Apr 2 15:06:52 2013 @@ -0,0 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with this + * work for additional information regarding copyright ownership. The ASF + * licenses this file to You 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 org.apache.sling.launchpad.testservices.fragment.testpackage; + +public class ClassFromFragment { +} Added: sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/ExportedPackageServlet.java URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/ExportedPackageServlet.java?rev=1463585&view=auto ============================================================================== --- sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/ExportedPackageServlet.java (added) +++ sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/ExportedPackageServlet.java Tue Apr 2 15:06:52 2013 @@ -0,0 +1,65 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 org.apache.sling.launchpad.testservices.servlets; + +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletResponse; + +import org.apache.felix.scr.annotations.Component; +import org.apache.felix.scr.annotations.Properties; +import org.apache.felix.scr.annotations.Property; +import org.apache.felix.scr.annotations.Reference; +import org.apache.felix.scr.annotations.Service; +import org.apache.sling.api.SlingHttpServletRequest; +import org.apache.sling.api.SlingHttpServletResponse; +import org.apache.sling.api.servlets.SlingSafeMethodsServlet; +import org.osgi.service.packageadmin.ExportedPackage; +import org.osgi.service.packageadmin.PackageAdmin; + +/** Test servlet for SLING-2808 */ +@Component(immediate=true, metatype=false) +@Service(value=javax.servlet.Servlet.class) +@Properties({ + @Property(name="service.description", value="Exported packages Test Servlet"), + @Property(name="service.vendor", value="The Apache Software Foundation"), + @Property(name="sling.servlet.resourceTypes", value="sling/servlet/default"), + @Property(name="sling.servlet.selectors", value="EXPORTED_PACKAGES"), + @Property(name="sling.servlet.extensions", value="txt") +}) +@SuppressWarnings("serial") +public class ExportedPackageServlet extends SlingSafeMethodsServlet { + @Reference + private PackageAdmin packageAdmin; + + @Override + protected void doGet(SlingHttpServletRequest request, SlingHttpServletResponse response) + throws ServletException, IOException { + final String packName = request.getParameter("package"); + final ExportedPackage p = packageAdmin.getExportedPackage(packName); + if(p == null) { + response.sendError(HttpServletResponse.SC_NOT_FOUND, "Package not found: " + packName); + } else { + response.setContentType("text/plain"); + response.setCharacterEncoding("UTF-8"); + response.getWriter().write("PACKAGE FOUND: "); + response.getWriter().write(p.toString()); + response.getWriter().flush(); + } + } +} \ No newline at end of file Modified: sling/trunk/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/pom.xml?rev=1463585&r1=1463584&r2=1463585&view=diff ============================================================================== --- sling/trunk/pom.xml (original) +++ sling/trunk/pom.xml Tue Apr 2 15:06:52 2013 @@ -218,6 +218,7 @@ launchpad/test-services launchpad/test-services-war + launchpad/test-fragment launchpad/test-bundles launchpad/integration-tests launchpad/testing