aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r1460705 - in /aries/trunk/blueprint: ./ blueprint-sample-war/ blueprint-sample-war/src/ blueprint-sample-war/src/main/ blueprint-sample-war/src/main/java/ blueprint-sample-war/src/main/java/org/ blueprint-sample-war/src/main/java/org/apach...
Date Mon, 25 Mar 2013 15:05:57 GMT
Author: gnodet
Date: Mon Mar 25 15:05:56 2013
New Revision: 1460705

URL: http://svn.apache.org/r1460705
Log:
initial spike of ARIES-1038 so that blueprint-noosgi can be easily used inside a servlet engine without an OSGi environment; but booting up all the META-INF/blueprint.xml files and performing the DI on everything using blueprint-noosgi

Added:
    aries/trunk/blueprint/blueprint-sample-war/
    aries/trunk/blueprint/blueprint-sample-war/LICENSE
    aries/trunk/blueprint/blueprint-sample-war/NOTICE
    aries/trunk/blueprint/blueprint-sample-war/pom.xml
    aries/trunk/blueprint/blueprint-sample-war/src/
    aries/trunk/blueprint/blueprint-sample-war/src/main/
    aries/trunk/blueprint/blueprint-sample-war/src/main/java/
    aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/
    aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/
    aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/
    aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/
    aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/
    aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/Account.java
    aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/AccountFactory.java
    aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/DefaultRunnable.java
    aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/Foo.java
    aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/FooRegistrationListener.java
    aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/InterfaceA.java
    aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/StaticAccountFactory.java
    aries/trunk/blueprint/blueprint-sample-war/src/main/resources/
    aries/trunk/blueprint/blueprint-sample-war/src/main/resources/META-INF/
    aries/trunk/blueprint/blueprint-sample-war/src/main/resources/META-INF/blueprint.xml
    aries/trunk/blueprint/blueprint-sample-war/src/main/webapp/
    aries/trunk/blueprint/blueprint-sample-war/src/main/webapp/WEB-INF/
    aries/trunk/blueprint/blueprint-sample-war/src/main/webapp/WEB-INF/web.xml
    aries/trunk/blueprint/blueprint-web/
    aries/trunk/blueprint/blueprint-web/LICENSE
    aries/trunk/blueprint/blueprint-web/NOTICE
    aries/trunk/blueprint/blueprint-web/pom.xml
    aries/trunk/blueprint/blueprint-web/src/
    aries/trunk/blueprint/blueprint-web/src/main/
    aries/trunk/blueprint/blueprint-web/src/main/appended-resources/
    aries/trunk/blueprint/blueprint-web/src/main/appended-resources/META-INF/
    aries/trunk/blueprint/blueprint-web/src/main/appended-resources/META-INF/NOTICE.vm
    aries/trunk/blueprint/blueprint-web/src/main/java/
    aries/trunk/blueprint/blueprint-web/src/main/java/org/
    aries/trunk/blueprint/blueprint-web/src/main/java/org/apache/
    aries/trunk/blueprint/blueprint-web/src/main/java/org/apache/aries/
    aries/trunk/blueprint/blueprint-web/src/main/java/org/apache/aries/blueprint/
    aries/trunk/blueprint/blueprint-web/src/main/java/org/apache/aries/blueprint/web/
    aries/trunk/blueprint/blueprint-web/src/main/java/org/apache/aries/blueprint/web/BlueprintContextListener.java
    aries/trunk/blueprint/blueprint-web/src/main/java/org/apache/aries/blueprint/web/packageinfo
Modified:
    aries/trunk/blueprint/pom.xml

Added: aries/trunk/blueprint/blueprint-sample-war/LICENSE
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-sample-war/LICENSE?rev=1460705&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-sample-war/LICENSE (added)
+++ aries/trunk/blueprint/blueprint-sample-war/LICENSE Mon Mar 25 15:05:56 2013
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
+

Added: aries/trunk/blueprint/blueprint-sample-war/NOTICE
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-sample-war/NOTICE?rev=1460705&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-sample-war/NOTICE (added)
+++ aries/trunk/blueprint/blueprint-sample-war/NOTICE Mon Mar 25 15:05:56 2013
@@ -0,0 +1,8 @@
+
+Apache Aries
+Copyright 2009-2011 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+

Added: aries/trunk/blueprint/blueprint-sample-war/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-sample-war/pom.xml?rev=1460705&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-sample-war/pom.xml (added)
+++ aries/trunk/blueprint/blueprint-sample-war/pom.xml Mon Mar 25 15:05:56 2013
@@ -0,0 +1,112 @@
+<!--
+    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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.aries</groupId>
+        <artifactId>java5-parent</artifactId>
+        <version>1.0.0</version>
+        <relativePath />
+    </parent>
+
+    <groupId>org.apache.aries.blueprint</groupId>
+    <artifactId>org.apache.aries.blueprint.sample.war</artifactId>
+    <name>Apache Aries Blueprint WAR Sample</name>
+    <packaging>war</packaging>
+    <version>1.0.0-SNAPSHOT</version>
+    <description>
+        Example blueprint web application using blueprint-noosgi, mostly used for integration tests.
+    </description>
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-sample-war</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-sample-war</developerConnection>
+        <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-sample</url>
+    </scm>
+
+    <properties>
+        <context>/</context>
+        <httpPort>8080</httpPort>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.aries.blueprint</groupId>
+            <artifactId>org.apache.aries.blueprint.web</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>jetty-maven-plugin</artifactId>
+                <version>8.1.8.v20121106</version>
+                <configuration>
+                    <scanIntervalSeconds>1</scanIntervalSeconds>
+                    <useTestScope>true</useTestScope>
+                    <webAppConfig>
+                        <contextPath>${context}</contextPath>
+                    </webAppConfig>
+                    <connectors>
+                        <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
+                            <port>${httpPort}</port>
+                            <maxIdleTime>60000</maxIdleTime>
+                        </connector>
+                    </connectors>
+                    <systemProperties>
+                        <systemProperty>
+                            <key>foo</key>
+                            <value>bar</value>
+                        </systemProperty>
+                    </systemProperties>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.tomcat.maven</groupId>
+                <artifactId>tomcat7-maven-plugin</artifactId>
+                <version>2.0</version>
+                <configuration>
+                    <port>${httpPort}</port>
+                    <path>${context}</path>
+                    <systemProperties>
+                    </systemProperties>
+                    <useTestClasspath>false</useTestClasspath>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.tomcat.maven</groupId>
+                <artifactId>tomcat6-maven-plugin</artifactId>
+                <version>2.0</version>
+                <configuration>
+                    <port>${httpPort}</port>
+                    <path>${context}</path>
+                    <systemProperties>
+                    </systemProperties>
+                    <useTestClasspath>false</useTestClasspath>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Added: aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/Account.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/Account.java?rev=1460705&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/Account.java (added)
+++ aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/Account.java Mon Mar 25 15:05:56 2013
@@ -0,0 +1,34 @@
+/**
+ *  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.aries.blueprint.sample;
+
+public class Account {
+    
+    private long accountNumber;
+    
+    public Account(long number) {
+        this.accountNumber = number;
+    }
+    
+    public long getAccountNumber() {
+        return this.accountNumber;
+    }
+    
+    public void setAccountNumber(long number) {
+        this.accountNumber = number;
+    }
+}

Added: aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/AccountFactory.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/AccountFactory.java?rev=1460705&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/AccountFactory.java (added)
+++ aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/AccountFactory.java Mon Mar 25 15:05:56 2013
@@ -0,0 +1,34 @@
+/**
+ *  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.aries.blueprint.sample;
+
+public class AccountFactory {
+    private String factoryName;
+
+    public AccountFactory(String factoryName) {
+        this.factoryName = factoryName;
+    }
+
+    public Account createAccount(long number) {
+        return new Account(number);
+    }
+    
+    public String getFactoryName() {
+        return this.factoryName;
+    }
+
+}

Added: aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/DefaultRunnable.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/DefaultRunnable.java?rev=1460705&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/DefaultRunnable.java (added)
+++ aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/DefaultRunnable.java Mon Mar 25 15:05:56 2013
@@ -0,0 +1,35 @@
+/*
+ * 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.aries.blueprint.sample;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class DefaultRunnable implements Runnable 
+{
+  private static AtomicInteger count = new AtomicInteger();
+  public void run() 
+  {
+    count.incrementAndGet();
+  }
+  
+  public int getCount()
+  {
+    return count.get();
+  }
+}
\ No newline at end of file

Added: aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/Foo.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/Foo.java?rev=1460705&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/Foo.java (added)
+++ aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/Foo.java Mon Mar 25 15:05:56 2013
@@ -0,0 +1,98 @@
+/**
+ *  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.aries.blueprint.sample;
+
+import java.io.Serializable;
+import java.util.Currency;
+import java.util.Date;
+import java.util.Map;
+
+public class Foo implements Serializable {
+    
+    private int a;
+    private int b;
+    private Currency currency;
+    private Date date;
+
+    public boolean initialized;
+    public boolean destroyed;
+    private Map<String, Object> props;
+
+    public int getA() {
+        return a;
+    }
+
+    public void setA(int i) {
+        a = i;
+    }
+
+    public int getB() {
+        return b;
+    }
+
+    public void setB(int i) {
+        b = i;
+    }
+
+    public Currency getCurrency() {
+        return currency;
+    }
+
+    public void setCurrency(Currency c) {
+        currency = c;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date d) {
+        date = d;
+    }
+
+    public String toString() {
+        return a + " " + b + " " + currency + " " + date;
+    }
+
+    public void init() {
+        System.out.println("======== Initializing Foo =========");
+        initialized = true;
+    }
+
+    public void destroy() {
+        System.out.println("======== Destroying Foo =========");
+        destroyed = true;
+    }
+
+    public boolean isInitialized() {
+        return initialized;
+    }
+
+    public boolean isDestroyed() {
+        return destroyed;
+    }
+
+    public void update(Map<String,Object> props) {
+        this.props = props;
+    }
+
+    public Map<String, Object> getProps() {
+        return props;
+    }
+
+}
+

Added: aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/FooRegistrationListener.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/FooRegistrationListener.java?rev=1460705&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/FooRegistrationListener.java (added)
+++ aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/FooRegistrationListener.java Mon Mar 25 15:05:56 2013
@@ -0,0 +1,45 @@
+/**
+ *  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.aries.blueprint.sample;
+
+import java.io.Serializable;
+import java.util.Map;
+
+public class FooRegistrationListener {
+        
+    private Map props;
+    
+    private Object lock = new Object();
+    
+    public void serviceRegistered(Serializable foo, Map props) {
+        System.out.println("Service registration notification: " + foo + " " + props);
+        synchronized (lock) {
+            this.props = props;
+        }
+    }
+    
+    public void serviceUnregistered(Foo foo, Map props) {
+        System.out.println("Service unregistration notification: " + foo + " " + props);
+    }
+    
+    public Map getProperties() {
+        synchronized (lock) {
+            return this.props;
+        }
+    }
+
+}

Added: aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/InterfaceA.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/InterfaceA.java?rev=1460705&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/InterfaceA.java (added)
+++ aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/InterfaceA.java Mon Mar 25 15:05:56 2013
@@ -0,0 +1,22 @@
+/**
+ *  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.aries.blueprint.sample;
+
+public interface InterfaceA {
+
+    String hello(String msg);
+}

Added: aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/StaticAccountFactory.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/StaticAccountFactory.java?rev=1460705&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/StaticAccountFactory.java (added)
+++ aries/trunk/blueprint/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/StaticAccountFactory.java Mon Mar 25 15:05:56 2013
@@ -0,0 +1,23 @@
+/**
+ *  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.aries.blueprint.sample;
+
+public class StaticAccountFactory {
+    public static Account createAccount(long number) {
+        return new Account(number);
+     }
+}

Added: aries/trunk/blueprint/blueprint-sample-war/src/main/resources/META-INF/blueprint.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-sample-war/src/main/resources/META-INF/blueprint.xml?rev=1460705&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-sample-war/src/main/resources/META-INF/blueprint.xml (added)
+++ aries/trunk/blueprint/blueprint-sample-war/src/main/resources/META-INF/blueprint.xml Mon Mar 25 15:05:56 2013
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+	<!--
+		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.
+	-->
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+	default-availability="optional">
+
+    <!--
+    	xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
+	xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.2.0"
+
+
+	<ext:property-placeholder placeholder-prefix="$["
+		placeholder-suffix="]" ignore-missing-locations="true"
+		system-properties="override" evaluator="jexl">
+		<ext:default-properties>
+			<ext:property name="name" value="value" />
+			<ext:property name="a" value="Hello " />
+			<ext:property name="b" value="FooBar" />
+		</ext:default-properties>
+		<ext:location>file:///url</ext:location>
+	</ext:property-placeholder>
+
+	<cm:property-placeholder id="property-placeholder"
+		persistent-id="blueprint-sample-placeholder">
+		<cm:default-properties>
+			<cm:property name="key.b" value="-1" />
+		</cm:default-properties>
+	</cm:property-placeholder>
+
+	<bean id="none-managed" class="org.apache.aries.blueprint.sample.Foo">
+		<cm:managed-properties persistent-id="blueprint-sample-managed.none"
+			update-strategy="none" />
+	</bean>
+
+	<bean id="component-managed" class="org.apache.aries.blueprint.sample.Foo">
+		<cm:managed-properties persistent-id="blueprint-sample-managed.component"
+			update-strategy="component-managed" update-method="update" />
+	</bean>
+
+	<bean id="container-managed" class="org.apache.aries.blueprint.sample.Foo">
+		<cm:managed-properties persistent-id="blueprint-sample-managed.container"
+			update-strategy="container-managed" />
+	</bean>
+	-->
+
+	<bean id="foo" class="org.apache.aries.blueprint.sample.Foo"
+		init-method="init" destroy-method="destroy">
+		<property name="a" value="5" />
+<!--
+		<property name="b" value="${key.b}" />
+		<property name="currency">
+			<value>PLN</value>
+		</property>
+		<property name="date">
+			<value>2009.04.17</value>
+		</property>
+-->
+	</bean>
+
+	<bean id="fooRegistrationListener"
+		class="org.apache.aries.blueprint.sample.FooRegistrationListener" />
+
+	<bean id="defaultRunnable" class="org.apache.aries.blueprint.sample.DefaultRunnable"/>
+
+	<bean id="accountOne" class="org.apache.aries.blueprint.sample.Account">
+		<argument value="1" />
+	</bean>
+
+	<bean id="accountTwo" class="org.apache.aries.blueprint.sample.StaticAccountFactory"
+		factory-method="createAccount">
+		<argument value="2" />
+	</bean>
+
+	<bean id="accountFactory" class="org.apache.aries.blueprint.sample.AccountFactory">
+		<argument value="account factory" />
+	</bean>
+
+	<bean id="accountThree" factory-ref="accountFactory"
+		factory-method="createAccount">
+		<argument value="3" />
+	</bean>
+</blueprint>
+

Added: aries/trunk/blueprint/blueprint-sample-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-sample-war/src/main/webapp/WEB-INF/web.xml?rev=1460705&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-sample-war/src/main/webapp/WEB-INF/web.xml (added)
+++ aries/trunk/blueprint/blueprint-sample-war/src/main/webapp/WEB-INF/web.xml Mon Mar 25 15:05:56 2013
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee">
+
+  <description>blueprint web sample</description>
+
+  <display-name>blueprint web sample</display-name>
+
+  <listener>
+    <listener-class>org.apache.aries.blueprint.web.BlueprintContextListener</listener-class>
+  </listener>
+
+  <welcome-file-list>
+    <welcome-file>index.html</welcome-file>
+  </welcome-file-list>
+
+</web-app>
+

Added: aries/trunk/blueprint/blueprint-web/LICENSE
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-web/LICENSE?rev=1460705&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-web/LICENSE (added)
+++ aries/trunk/blueprint/blueprint-web/LICENSE Mon Mar 25 15:05:56 2013
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
+

Added: aries/trunk/blueprint/blueprint-web/NOTICE
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-web/NOTICE?rev=1460705&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-web/NOTICE (added)
+++ aries/trunk/blueprint/blueprint-web/NOTICE Mon Mar 25 15:05:56 2013
@@ -0,0 +1,8 @@
+
+Apache Aries
+Copyright 2009-2011 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+

Added: aries/trunk/blueprint/blueprint-web/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-web/pom.xml?rev=1460705&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-web/pom.xml (added)
+++ aries/trunk/blueprint/blueprint-web/pom.xml Mon Mar 25 15:05:56 2013
@@ -0,0 +1,148 @@
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.aries</groupId>
+        <artifactId>java5-parent</artifactId>
+        <version>1.0.0</version>
+        <relativePath />
+    </parent>
+
+    <groupId>org.apache.aries.blueprint</groupId>
+    <artifactId>org.apache.aries.blueprint.web</artifactId>
+    <packaging>jar</packaging>
+    <name>Apache Aries Blueprint Web</name>
+    <version>1.0.0-SNAPSHOT</version>
+    <description>
+        This bundle contains a Servlet ContextListener for bootstrapping
+        blueprint inside web containers.
+    </description>
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-web</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-web</developerConnection>
+        <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-web</url>
+    </scm>
+    <properties>
+        <blueprint.api.version>1.0.0</blueprint.api.version>
+        <blueprint.core.version>1.0.0</blueprint.core.version>
+        <blueprint.parser.version>1.0.0</blueprint.parser.version>
+        <proxy.impl.version>1.0.0</proxy.impl.version>
+        <blueprint.nosgi.version>1.0.0-SNAPSHOT</blueprint.nosgi.version>
+    </properties>
+
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <properties>
+              <blueprint.api.version>1.0.1-SNAPSHOT</blueprint.api.version>
+              <blueprint.core.version>1.0.1-SNAPSHOT</blueprint.core.version>
+              <blueprint.parser.version>1.0.1-SNAPSHOT</blueprint.parser.version>
+            </properties>
+        </profile>
+    </profiles>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.aries.blueprint</groupId>
+            <artifactId>org.apache.aries.blueprint.api</artifactId>
+            <version>${blueprint.api.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.blueprint</groupId>
+            <artifactId>org.apache.aries.blueprint.noosgi</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <scope>provided</scope>
+            <version>1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+            <resource>
+                <directory>${project.build.sourceDirectory}</directory>
+                <includes>
+                    <include>**/packageinfo</include>
+                </includes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack-sources</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.aries.blueprint</groupId>
+                                    <artifactId>org.apache.aries.blueprint.api</artifactId>
+                                    <includes>**/blueprint.xsd</includes>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>${project.build.directory}/sources</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.aries.versioning</groupId>
+                <artifactId>org.apache.aries.versioning.plugin</artifactId>
+                <version>0.1.0</version>
+                <executions>
+                    <execution>
+                        <id>default-verify</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>version-check</goal>
+                        </goals>
+                        <configuration>
+                            <oldArtifact>org.apache.aries.blueprint:org.apache.aries.blueprint.core:1.1.0</oldArtifact>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+        
+</project>

Added: aries/trunk/blueprint/blueprint-web/src/main/appended-resources/META-INF/NOTICE.vm
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-web/src/main/appended-resources/META-INF/NOTICE.vm?rev=1460705&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-web/src/main/appended-resources/META-INF/NOTICE.vm (added)
+++ aries/trunk/blueprint/blueprint-web/src/main/appended-resources/META-INF/NOTICE.vm Mon Mar 25 15:05:56 2013
@@ -0,0 +1,2 @@
+This product includes software developed at
+the OSGi Alliance (http://www.osgi.org/).
\ No newline at end of file

Added: aries/trunk/blueprint/blueprint-web/src/main/java/org/apache/aries/blueprint/web/BlueprintContextListener.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-web/src/main/java/org/apache/aries/blueprint/web/BlueprintContextListener.java?rev=1460705&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-web/src/main/java/org/apache/aries/blueprint/web/BlueprintContextListener.java (added)
+++ aries/trunk/blueprint/blueprint-web/src/main/java/org/apache/aries/blueprint/web/BlueprintContextListener.java Mon Mar 25 15:05:56 2013
@@ -0,0 +1,64 @@
+/**
+ *
+ * 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.aries.blueprint.web;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Set;
+import org.apache.aries.blueprint.container.BlueprintContainerImpl;
+
+/**
+ * Initialises all the blueprint XML files called <code>META-INF/blueprint.xml</code> on the classpath
+ */
+public class BlueprintContextListener implements ServletContextListener {
+    public static final String CONTAINER_ATTRIBUTE = "org.apache.aries.blueprint.container";
+
+    public void contextInitialized(ServletContextEvent event) {
+        ServletContext servletContext = event.getServletContext();
+        String blueprintPath = "META-INF/blueprint.xml";
+        Set<URL> resourcePathSet = servletContext.getResourcePaths(blueprintPath);
+        List<URL> resourcePaths = new ArrayList<URL>(resourcePathSet);
+        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+        try {
+            Enumeration<URL> resources = classLoader.getResources(blueprintPath);
+            while (resources.hasMoreElements()) {
+                resourcePaths.add(resources.nextElement());
+            }
+            servletContext.log("Loading Blueprint contexts " + resourcePaths);
+            BlueprintContainerImpl container = new BlueprintContainerImpl(classLoader, resourcePaths);
+            servletContext.setAttribute(CONTAINER_ATTRIBUTE, container);
+        } catch (Exception e) {
+            servletContext.log("Failed to startup blueprint container. " + e, e);
+        }
+    }
+
+    public void contextDestroyed(ServletContextEvent event) {
+        ServletContext servletContext = event.getServletContext();
+        Object container = servletContext.getAttribute(CONTAINER_ATTRIBUTE);
+        if (container instanceof BlueprintContainerImpl) {
+            BlueprintContainerImpl blueprint = (BlueprintContainerImpl) container;
+            blueprint.destroy();
+        }
+    }
+}

Added: aries/trunk/blueprint/blueprint-web/src/main/java/org/apache/aries/blueprint/web/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-web/src/main/java/org/apache/aries/blueprint/web/packageinfo?rev=1460705&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-web/src/main/java/org/apache/aries/blueprint/web/packageinfo (added)
+++ aries/trunk/blueprint/blueprint-web/src/main/java/org/apache/aries/blueprint/web/packageinfo Mon Mar 25 15:05:56 2013
@@ -0,0 +1,19 @@
+
+# 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.
+#
+version 1.0.0

Modified: aries/trunk/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/pom.xml?rev=1460705&r1=1460704&r2=1460705&view=diff
==============================================================================
--- aries/trunk/blueprint/pom.xml (original)
+++ aries/trunk/blueprint/pom.xml Mon Mar 25 15:05:56 2013
@@ -46,12 +46,14 @@
         <module>blueprint-compatibility</module>
         <module>blueprint-core-compatibility</module>
         <module>blueprint-noosgi</module>
+        <module>blueprint-web</module>
         <module>blueprint-jexl-evaluator</module>
         <module>blueprint-sample</module>
         <module>blueprint-annotation-api</module>
         <module>blueprint-annotation-impl</module>
         <module>blueprint-sample-annotation</module>
         <module>blueprint-sample-fragment</module>
+        <module>blueprint-sample-war</module>
         <module>blueprint-testbundlea</module>
         <module>blueprint-testbundleb</module>
         <module>blueprint-testquiescebundle</module>



Mime
View raw message