Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Explicitly add deps on all CDI packages -- for CDI API instances service events lookup.

Conflicts:

environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/UsageTest.java

  1. … 7 more files in changeset.
Refactor OSGi tests

  1. … 14 more files in changeset.
Refactor OSGi tests

  1. … 14 more files in changeset.
Upgrade to OSGi 4.3.1.

  1. … 5 more files in changeset.
Upgrade to OSGi 4.3.1.

Conflicts:

environments/osgi/tests/tester/pom.xml

pom.xml

  1. … 5 more files in changeset.
Add concrete class test.

  1. … 3 more files in changeset.
Add concrete class test.

  1. … 3 more files in changeset.
WELD-1287: Add integration test to validate weld osgi on Apache Karaf

  1. … 2 more files in changeset.
WELD-1287: Add integration test to validate weld osgi on Apache Karaf

Conflicts:

environments/osgi/tests/tester/pom.xml

pom.xml

  1. … 2 more files in changeset.
WELD-1287: Add integration test to validate weld osgi on Apache Karaf

    • -0
    • +126
    ./org/jboss/weld/environment/osgi/tests/karaf/ContainerTest.java
  1. … 2 more files in changeset.
WELD-1287: Add integration test to validate weld osgi on Apache Karaf

    • -0
    • +126
    ./org/jboss/weld/environment/osgi/tests/karaf/ContainerTest.java
  1. … 2 more files in changeset.
WELD-1265 Symbolic-Name of all weld-osgi bundles is not in a standard form

Conflicts:

environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/InfrastructureTest.java

environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/jsr299/ExtensionTest.java

WELD-1265 Symbolic-Name of all weld-osgi bundles is not in a standard form

Fix inner EJB, ignore Lifecycle test for now, upgrade ARQ, AS7-TCK_runner.

  1. … 2 more files in changeset.
"Fix" event test -- TODO on why the offset!

"Fix" event test -- TODO on why the offset!

Use Geronimo AtInject, fix BundleContext usage.

Conflicts:

environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/event/EventTest.java

environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/InfrastructureTest.java

environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/jsr299/ExtensionTest.java

environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/MetaFilterTest.java

environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/ServiceConsumingTest.java

pom.xml

  1. … 1 more file in changeset.
Use Geronimo AtInject, fix BundleContext usage.

  1. … 2 more files in changeset.
Fix string mixup.

Fix string mixup.

Upgrade Pax Exam + centralize project version usage.

  1. … 2 more files in changeset.
Upgrade Pax Exam + centralize project version usage.

Conflicts:

environments/osgi/tests/bundles/bundle1/pom.xml

environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/event/EventTest.java

environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/BundleScannerTest.java

environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/InfrastructureTest.java

environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/LifeCycleTest.java

environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/UsageTest.java

environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/jsr299/ExtensionTest.java

environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/osgi/OSGiFacilitationTest.java

environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/MetaFilterTest.java

environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/ServiceConsumingTest.java

environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/ServicePublishingTest.java

environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/util/Environment.java

  1. … 2 more files in changeset.
Update version to 1.2.0-SNAPSHOT; TODO - fix failing OSGi tests

  1. … 67 more files in changeset.
Fix version.

  1. … 68 more files in changeset.
Change version. Use 1.1.5-SNAPSHOT

  1. … 68 more files in changeset.
Change version

  1. … 68 more files in changeset.
Add Knopflerfish OSGi implementation container example

  1. … 7 more files in changeset.
Add Knopflerfish OSGi implementation container example

Conflicts:

environments/osgi/examples/container-equinox/pom.xml

environments/osgi/examples/container-knopflerfish/pom.xml

environments/osgi/pom.xml

  1. … 6 more files in changeset.
Fix web app sample

  1. … 25 more files in changeset.
Fix web app sample

Conflicts:

environments/osgi/examples/web/web-fwk/pom.xml

  1. … 25 more files in changeset.