[jboss-cvs] JBossAS SVN: r83591 - in projects/jboss-osgi/branches: tdiesler and 63 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jan 29 01:03:07 EST 2009
Author: thomas.diesler at jboss.com
Date: 2009-01-29 01:03:06 -0500 (Thu, 29 Jan 2009)
New Revision: 83591
Added:
projects/jboss-osgi/branches/tdiesler/
projects/jboss-osgi/branches/tdiesler/.classpath
projects/jboss-osgi/branches/tdiesler/.project
projects/jboss-osgi/branches/tdiesler/eclipse/
projects/jboss-osgi/branches/tdiesler/eclipse/eclipse.code.style.xml
projects/jboss-osgi/branches/tdiesler/eclipse/readme-commiters.txt
projects/jboss-osgi/branches/tdiesler/modules/
projects/jboss-osgi/branches/tdiesler/modules/distribution/
projects/jboss-osgi/branches/tdiesler/modules/distribution/.classpath
projects/jboss-osgi/branches/tdiesler/modules/distribution/.project
projects/jboss-osgi/branches/tdiesler/modules/distribution/pom.xml
projects/jboss-osgi/branches/tdiesler/modules/distribution/scripts/
projects/jboss-osgi/branches/tdiesler/modules/distribution/scripts/antrun-installer.xml
projects/jboss-osgi/branches/tdiesler/modules/distribution/scripts/assembly-deploy-artifacts.xml
projects/jboss-osgi/branches/tdiesler/modules/distribution/src/
projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/
projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/etc/
projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/etc/JBossORG-EULA.txt
projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/etc/release.notes.html
projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/resources/
projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/resources/installer/
projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/resources/installer/ant-actions-spec.xml
projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/resources/installer/auto-install-template.xml
projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/resources/installer/install-definition.xml
projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/resources/installer/target-panel-dir.txt
projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/resources/installer/user-input-spec.xml
projects/jboss-osgi/branches/tdiesler/modules/felix/
projects/jboss-osgi/branches/tdiesler/modules/felix/.classpath
projects/jboss-osgi/branches/tdiesler/modules/felix/.project
projects/jboss-osgi/branches/tdiesler/modules/felix/pom.xml
projects/jboss-osgi/branches/tdiesler/modules/felix/scripts/
projects/jboss-osgi/branches/tdiesler/modules/felix/scripts/assembly-config.xml
projects/jboss-osgi/branches/tdiesler/modules/felix/src/
projects/jboss-osgi/branches/tdiesler/modules/felix/src/main/
projects/jboss-osgi/branches/tdiesler/modules/felix/src/main/java/
projects/jboss-osgi/branches/tdiesler/modules/felix/src/main/java/org/
projects/jboss-osgi/branches/tdiesler/modules/felix/src/main/java/org/jboss/
projects/jboss-osgi/branches/tdiesler/modules/felix/src/main/java/org/jboss/osgi/
projects/jboss-osgi/branches/tdiesler/modules/felix/src/main/java/org/jboss/osgi/felix/
projects/jboss-osgi/branches/tdiesler/modules/felix/src/main/java/org/jboss/osgi/felix/framework/
projects/jboss-osgi/branches/tdiesler/modules/felix/src/main/java/org/jboss/osgi/felix/framework/BundleDeployer.java
projects/jboss-osgi/branches/tdiesler/modules/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java
projects/jboss-osgi/branches/tdiesler/modules/felix/src/main/resources/
projects/jboss-osgi/branches/tdiesler/modules/felix/src/main/resources/jboss-beans.xml
projects/jboss-osgi/branches/tdiesler/modules/felix/src/main/resources/org.jboss.osgi.spi.framework.ConfigurationProvider
projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/
projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/
projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/
projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/
projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/osgi/
projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/osgi/felix/
projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/osgi/felix/microcontainer/
projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/osgi/felix/microcontainer/ConfiguredService.java
projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/osgi/felix/microcontainer/ConfiguredServiceTest.java
projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/osgi/felix/microcontainer/ExplicitService.java
projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/osgi/felix/microcontainer/ExplicitServiceTest.java
projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/osgi/felix/microcontainer/MyBean.java
projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/osgi/felix/system/
projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/osgi/felix/system/SystemBundleTest.java
projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/resources/
projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/resources/jboss-osgi-beans.xml
projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/resources/log4j.xml
projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/resources/microcontainer/
projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/resources/microcontainer/configured-service-test.xml
projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/resources/microcontainer/explicit-service-test.xml
projects/jboss-osgi/branches/tdiesler/modules/service/
projects/jboss-osgi/branches/tdiesler/modules/service/http-beans/
projects/jboss-osgi/branches/tdiesler/modules/service/http-beans/.classpath
projects/jboss-osgi/branches/tdiesler/modules/service/http-beans/.project
projects/jboss-osgi/branches/tdiesler/modules/service/http-beans/pom.xml
projects/jboss-osgi/branches/tdiesler/modules/service/http-beans/src/
projects/jboss-osgi/branches/tdiesler/modules/service/http-beans/src/main/
projects/jboss-osgi/branches/tdiesler/modules/service/http-beans/src/main/java/
projects/jboss-osgi/branches/tdiesler/modules/service/http-beans/src/main/java/org/
projects/jboss-osgi/branches/tdiesler/modules/service/http-beans/src/main/java/org/jboss/
projects/jboss-osgi/branches/tdiesler/modules/service/http-beans/src/main/java/org/jboss/osgi/
projects/jboss-osgi/branches/tdiesler/modules/service/http-beans/src/main/java/org/jboss/osgi/service/
projects/jboss-osgi/branches/tdiesler/modules/service/http-beans/src/main/java/org/jboss/osgi/service/http/
projects/jboss-osgi/branches/tdiesler/modules/service/http-beans/src/main/java/org/jboss/osgi/service/http/beans/
projects/jboss-osgi/branches/tdiesler/modules/service/http-beans/src/main/java/org/jboss/osgi/service/http/beans/WebAppGeneratorService.java
projects/jboss-osgi/branches/tdiesler/modules/service/http/
projects/jboss-osgi/branches/tdiesler/modules/service/http/.classpath
projects/jboss-osgi/branches/tdiesler/modules/service/http/.project
projects/jboss-osgi/branches/tdiesler/modules/service/http/pom.xml
projects/jboss-osgi/branches/tdiesler/modules/service/http/src/
projects/jboss-osgi/branches/tdiesler/modules/service/http/src/main/
projects/jboss-osgi/branches/tdiesler/modules/service/http/src/main/java/
projects/jboss-osgi/branches/tdiesler/modules/service/http/src/main/java/org/
projects/jboss-osgi/branches/tdiesler/modules/service/http/src/main/java/org/jboss/
projects/jboss-osgi/branches/tdiesler/modules/service/http/src/main/java/org/jboss/osgi/
projects/jboss-osgi/branches/tdiesler/modules/service/http/src/main/java/org/jboss/osgi/service/
projects/jboss-osgi/branches/tdiesler/modules/service/http/src/main/java/org/jboss/osgi/service/http/
projects/jboss-osgi/branches/tdiesler/modules/service/http/src/main/java/org/jboss/osgi/service/http/Activator.java
projects/jboss-osgi/branches/tdiesler/modules/service/http/src/main/java/org/jboss/osgi/service/http/HttpContextImpl.java
projects/jboss-osgi/branches/tdiesler/modules/service/http/src/main/java/org/jboss/osgi/service/http/HttpServiceException.java
projects/jboss-osgi/branches/tdiesler/modules/service/http/src/main/java/org/jboss/osgi/service/http/HttpServiceImpl.java
projects/jboss-osgi/branches/tdiesler/modules/service/http/src/main/java/org/jboss/osgi/service/http/NotImplementedException.java
projects/jboss-osgi/branches/tdiesler/modules/service/pom.xml
projects/jboss-osgi/branches/tdiesler/modules/spi/
projects/jboss-osgi/branches/tdiesler/modules/spi/.classpath
projects/jboss-osgi/branches/tdiesler/modules/spi/.project
projects/jboss-osgi/branches/tdiesler/modules/spi/pom.xml
projects/jboss-osgi/branches/tdiesler/modules/spi/src/
projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/
projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/
projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/
projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/
projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/
projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/service/
projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/service/MicrocontainerService.java
projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/
projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/FrameworkException.java
projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/NotImplementedException.java
projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/ObjectNameFactory.java
projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/framework/
projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/framework/Configuration.java
projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/framework/ConfigurationProvider.java
projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiFramework.java
projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/internal/
projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/internal/EmbeddedBeansDeployer.java
projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/internal/KernelLocator.java
projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/internal/MicrocontainerConfigurationProvider.java
projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/
projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/ArchiveDeployer.java
projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/IntegrationTestCase.java
projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/IntegrationTestHelper.java
projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/IntegrationTestSetup.java
projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/JBossArchiveDeployer.java
projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/OSGiTestCase.java
projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/OSGiTestHelper.java
projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/OSGiTestSetup.java
projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/resources/
projects/jboss-osgi/branches/tdiesler/modules/spi/src/test/
projects/jboss-osgi/branches/tdiesler/modules/spi/src/test/java/
projects/jboss-osgi/branches/tdiesler/modules/spi/src/test/resources/
projects/jboss-osgi/branches/tdiesler/pom.xml
projects/jboss-osgi/branches/tdiesler/profiles.xml.example
Log:
Initial import
Added: projects/jboss-osgi/branches/tdiesler/.classpath
===================================================================
--- projects/jboss-osgi/branches/tdiesler/.classpath (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/.classpath 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: projects/jboss-osgi/branches/tdiesler/.project
===================================================================
--- projects/jboss-osgi/branches/tdiesler/.project (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/.project 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jboss-osgi</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Added: projects/jboss-osgi/branches/tdiesler/eclipse/eclipse.code.style.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/eclipse/eclipse.code.style.xml (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/eclipse/eclipse.code.style.xml 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<profiles version="11">
+<profile kind="CodeFormatterProfile" name="jboss.osgi.code.style" version="11">
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
+<setting id="org.eclipse.jdt.core.compiler.source" value="1.5"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="164"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.5"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
+<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="168"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.5"/>
+<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+</profile>
+</profiles>
Property changes on: projects/jboss-osgi/branches/tdiesler/eclipse/eclipse.code.style.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/eclipse/readme-commiters.txt
===================================================================
--- projects/jboss-osgi/branches/tdiesler/eclipse/readme-commiters.txt (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/eclipse/readme-commiters.txt 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,25 @@
+#
+# $Id$
+#
+
+1. Edit your subversion config ~/.subversion/config and set the following in each section:
+
+[miscellany]
+enable-auto-props = yes
+
+[auto-props]
+*.bat = svn:keywords=Id Revision;svn:eol-style=LF
+*.java = svn:keywords=Id Revision;svn:eol-style=LF
+*.sh = svn:keywords=Id Revision;svn:eol-style=LF
+*.txt = svn:keywords=Id Revision;svn:eol-style=LF
+*.wsdl = svn:keywords=Id Revision;svn:eol-style=LF
+*.xml = svn:keywords=Id Revision;svn:eol-style=LF
+*.xsd = svn:keywords=Id Revision;svn:eol-style=LF
+
+2. If you are using an IDE, make sure that it refers to the same config. So,
+for example, if you are using Eclipse with Subclipse on windows, you need to
+set Team->SVN->Configuration Location to:
+
+/home/<your user name>/.subversion
+
+3. If you are using Eclipse, set your code style to jBPMCodeStyle.xml
Property changes on: projects/jboss-osgi/branches/tdiesler/eclipse/readme-commiters.txt
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/distribution/.classpath
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/distribution/.classpath (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/distribution/.classpath 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path=""/>
+</classpath>
Added: projects/jboss-osgi/branches/tdiesler/modules/distribution/.project
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/distribution/.project (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/distribution/.project 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jbpm-distribution</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Added: projects/jboss-osgi/branches/tdiesler/modules/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/distribution/pom.xml (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/distribution/pom.xml 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+ <!-- ====================================================================== -->
+ <!-- -->
+ <!-- JBoss, the OpenSource J2EE webOS -->
+ <!-- -->
+ <!-- Distributable under LGPL license. -->
+ <!-- See terms of license at http://www.gnu.org. -->
+ <!-- -->
+ <!-- ====================================================================== -->
+
+ <!-- $Id$ -->
+<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>
+
+ <name>JBoss OSGi - Distribution</name>
+ <description>JBoss OSGi - IzPack Distribution</description>
+
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-distribution</artifactId>
+ <packaging>pom</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-integration</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <!-- Properties -->
+ <properties>
+ <izpack.version>4.2.0</izpack.version>
+ </properties>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-felix</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-felix</artifactId>
+ <classifier>config</classifier>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-service-http</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>javax.servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.webconsole</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.izpack</groupId>
+ <artifactId>izpack-standalone-compiler</artifactId>
+ <version>${izpack.version}</version>
+ </dependency>
+ </dependencies>
+
+ <!-- Plugins -->
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>directory-single</goal>
+ </goals>
+ <configuration>
+ <finalName>deploy-artifacts</finalName>
+ <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>scripts/assembly-deploy-artifacts.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>izpack</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <property name="maven.runtime.classpath" refid="maven.runtime.classpath" />
+ <property name="jboss500.home" value="${jboss500.home}" />
+ <property name="product.name" value="${project.name}" />
+ <property name="product.short.name" value="${artifactId}" />
+ <property name="product.version" value="${project.version}" />
+ <property name="user.home" value="${user.home}" />
+ <ant antfile="scripts/antrun-installer.xml" target="build-installer" />
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/distribution/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/distribution/scripts/antrun-installer.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/distribution/scripts/antrun-installer.xml (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/distribution/scripts/antrun-installer.xml 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+ <property name="output.dir" value="${basedir}/target" />
+ <property name="resources.dir" value="${basedir}/src/main/resources" />
+ <property name="filtered.resources.dir" value="${output.dir}/resources" />
+ <property name="deploy.artifacts.dir" value="${output.dir}/deploy-artifacts" />
+ <property name="deploy.artifacts.lib" value="${deploy.artifacts.dir}/lib" />
+ <property name="deploy.artifacts.resources" value="${deploy.artifacts.dir}/resources" />
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+ <target name="init"/>
+
+ <!-- ================================================================== -->
+ <!-- Distribution -->
+ <!-- ================================================================== -->
+ <target name="build-installer" depends="init">
+
+ <echo/>
+ <echo message="JBoss Home: ${jboss500.home}"/>
+ <echo/>
+
+ <!-- Filter the installer scripts -->
+ <copy todir="${filtered.resources.dir}" filtering="true" overwrite="true">
+ <fileset dir="${resources.dir}/installer" />
+ <filterset>
+ <filter token="jboss.home" value="${jboss500.home}" />
+ <filter token="product.version" value="${product.version}" />
+ <filter token="user.home" value="${user.home}" />
+ </filterset>
+ </copy>
+
+ <!-- HACK ALERT -->
+ <copy file="${deploy.artifacts.lib}/org.apache.felix.webconsole.jar" tofile="${deploy.artifacts.lib}/org.apache.felix.webconsole.bundle" overwrite="true"/>
+
+ <!-- Run the IzPack Ant task -->
+ <taskdef name="izpack" classname="com.izforge.izpack.ant.IzPackTask">
+ <classpath>
+ <pathelement path="${maven.runtime.classpath}" />
+ </classpath>
+ </taskdef>
+ <property name="izpack.temp.dir" value="${output.dir}/izpack-temp" />
+ <mkdir dir="${izpack.temp.dir}" />
+
+ <!-- Run installer build -->
+ <echo message="Running IzPack to build the installer..." />
+ <izpack input="${resources.dir}/installer/install-definition.xml" output="${output.dir}/jboss-osgi-installer-${product.version}.jar"
+ installerType="standard" inheritAll="true" basedir="${izpack.temp.dir}" />
+
+ <!-- Clean working directory -->
+ <delete dir="${izpack.temp.dir}" quiet="true" includeemptydirs="true" />
+ </target>
+</project>
\ No newline at end of file
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/distribution/scripts/antrun-installer.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/distribution/scripts/assembly-deploy-artifacts.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/distribution/scripts/assembly-deploy-artifacts.xml (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/distribution/scripts/assembly-deploy-artifacts.xml 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,45 @@
+<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+
+ <id>deploy-artifacts</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <!-- Dependency Sets -->
+ <dependencySets>
+
+ <!-- lib -->
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <scope>compile</scope>
+ <unpack>false</unpack>
+ </dependencySet>
+
+ <!-- resources -->
+ <dependencySet>
+ <outputDirectory>resources/jboss-osgi-felix-config</outputDirectory>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>*:jboss-osgi-felix:jar:config</include>
+ </includes>
+ <unpack>true</unpack>
+ </dependencySet>
+
+ </dependencySets>
+
+ <fileSets>
+ <!-- etc -->
+ <fileSet>
+ <directory>src/main/etc</directory>
+ <outputDirectory>/etc</outputDirectory>
+ <includes>
+ <include>JBossORG-EULA.txt</include>
+ <include>release.notes.html</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/distribution/scripts/assembly-deploy-artifacts.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/etc/JBossORG-EULA.txt
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/etc/JBossORG-EULA.txt (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/etc/JBossORG-EULA.txt 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,107 @@
+LICENSE AGREEMENT
+JBOSS(r)
+
+This License Agreement governs the use of the Software Packages and any updates to the Software
+Packages, regardless of the delivery mechanism. Each Software Package is a collective work
+under U.S. Copyright Law. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to
+the user ("Client") a license to the applicable collective work(s) pursuant to the
+GNU Lesser General Public License v. 2.1 except for the following Software Packages:
+(a) JBoss Portal Forums and JBoss Transactions JTS, each of which is licensed pursuant to the
+GNU General Public License v.2;
+
+(b) JBoss Rules, which is licensed pursuant to the Apache License v.2.0;
+
+(c) an optional download for JBoss Cache for the Berkeley DB for Java database, which is licensed under the
+(open source) Sleepycat License (if Client does not wish to use the open source version of this database,
+it may purchase a license from Sleepycat Software);
+
+and (d) the BPEL extension for JBoss jBPM, which is licensed under the Common Public License v.1,
+and, pursuant to the OASIS BPEL4WS standard, requires parties wishing to redistribute to enter various
+royalty-free patent licenses.
+
+Each of the foregoing licenses is available at http://www.opensource.org/licenses/index.php.
+
+1. The Software. "Software Packages" refer to the various software modules that are created and made available
+for distribution by the JBoss.org open source community at http://www.jboss.org. Each of the Software Packages
+may be comprised of hundreds of software components. The end user license agreement for each component is located in
+the component's source code. With the exception of certain image files identified in Section 2 below,
+the license terms for the components permit Client to copy, modify, and redistribute the component,
+in both source code and binary code forms. This agreement does not limit Client's rights under,
+or grant Client rights that supersede, the license terms of any particular component.
+
+2. Intellectual Property Rights. The Software Packages are owned by Red Hat and others and are protected under copyright
+and other laws. Title to the Software Packages and any component, or to any copy, modification, or merged portion shall
+remain with the aforementioned, subject to the applicable license. The "JBoss" trademark, "Red Hat" trademark, the
+individual Software Package trademarks, and the "Shadowman" logo are registered trademarks of Red Hat and its affiliates
+in the U.S. and other countries. This agreement permits Client to distribute unmodified copies of the Software Packages
+using the Red Hat trademarks that Red Hat has inserted in the Software Packages on the condition that Client follows Red Hat's
+trademark guidelines for those trademarks located at http://www.redhat.com/about/corporate/trademark/. Client must abide by
+these trademark guidelines when distributing the Software Packages, regardless of whether the Software Packages have been modified.
+If Client modifies the Software Packages, then Client must replace all Red Hat trademarks and logos identified at
+http://www.jboss.com/company/logos, unless a separate agreement with Red Hat is executed or other permission granted.
+Merely deleting the files containing the Red Hat trademarks may corrupt the Software Packages.
+
+3. Limited Warranty. Except as specifically stated in this Paragraph 3 or a license for a particular
+component, to the maximum extent permitted under applicable law, the Software Packages and the
+components are provided and licensed "as is" without warranty of any kind, expressed or implied,
+including the implied warranties of merchantability, non-infringement or fitness for a particular purpose.
+Red Hat warrants that the media on which Software Packages may be furnished will be free from defects in
+materials and manufacture under normal use for a period of 30 days from the date of delivery to Client.
+Red Hat does not warrant that the functions contained in the Software Packages will meet Client's requirements
+or that the operation of the Software Packages will be entirely error free or appear precisely as described
+in the accompanying documentation. This warranty extends only to the party that purchases the Services
+pertaining to the Software Packages from Red Hat or a Red Hat authorized distributor.
+
+4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, the remedies
+described below are accepted by Client as its only remedies. Red Hat's entire liability, and Client's
+exclusive remedies, shall be: If the Software media is defective, Client may return it within 30 days of
+delivery along with a copy of Client's payment receipt and Red Hat, at its option, will replace it or
+refund the money paid by Client for the Software. To the maximum extent permitted by applicable law,
+Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential
+damages, including lost profits or lost savings arising out of the use or inability to use the Software,
+even if Red Hat or such dealer has been advised of the possibility of such damages. In no event shall
+Red Hat's liability under this agreement exceed the amount that Client paid to Red Hat under this
+Agreement during the twelve months preceding the action.
+
+5. Export Control. As required by U.S. law, Client represents and warrants that it:
+(a) understands that the Software Packages are subject to export controls under the
+U.S. Commerce Department's Export Administration Regulations ("EAR");
+
+(b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations
+(currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria);
+
+(c) will not export, re-export, or transfer the Software Packages to any prohibited destination, entity,
+or individual without the necessary export license(s) or authorizations(s) from the U.S. Government;
+
+(d) will not use or transfer the Software Packages for use in any sensitive nuclear, chemical or
+biological weapons, or missile technology end-uses unless authorized by the U.S. Government by
+regulation or specific license;
+
+(e) understands and agrees that if it is in the United States and exports or transfers the Software
+Packages to eligible end users, it will, as required by EAR Section 740.17(e), submit semi-annual
+reports to the Commerce Department's Bureau of Industry & Security (BIS), which include the name and
+address (including country) of each transferee;
+
+and (f) understands that countries other than the United States may restrict the import, use, or
+export of encryption products and that it shall be solely responsible for compliance with any such
+import, use, or export restrictions.
+
+6. Third Party Programs. Red Hat may distribute third party software programs with the Software Packages
+that are not part of the Software Packages and which Client must install separately. These third party
+programs are subject to their own license terms. The license terms either accompany the programs or
+can be viewed at http://www.redhat.com/licenses/. If Client does not agree to abide by the applicable
+license terms for such programs, then Client may not install them. If Client wishes to install the programs
+on more than one system or transfer the programs to another party, then Client must contact the licensor
+of the programs.
+
+7. General. If any provision of this agreement is held to be unenforceable, that shall not affect the
+enforceability of the remaining provisions. This License Agreement shall be governed by the laws of the
+State of North Carolina and of the United States, without regard to any conflict of laws provisions,
+except that the United Nations Convention on the International Sale of Goods shall not apply.
+
+Copyright 2006 Red Hat, Inc. All rights reserved.
+"JBoss" and the JBoss logo are registered trademarks of Red Hat, Inc.
+All other trademarks are the property of their respective owners.
+
+ Page 1 of 1 18 October 2006
+
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/etc/JBossORG-EULA.txt
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/etc/release.notes.html
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/etc/release.notes.html (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/etc/release.notes.html 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,2 @@
+<body><h1>JBoss OSGi 1.0.0.Alpha1 Release Notes</h1>
+</body>
\ No newline at end of file
Added: projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/resources/installer/ant-actions-spec.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/resources/installer/ant-actions-spec.xml (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/resources/installer/ant-actions-spec.xml 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,14 @@
+<antactions>
+ <pack name="Download JBoss-5.0.0">
+ <antcall order="afterpack" buildfile="$INSTALL_PATH/Uninstaller/download-helper.xml">
+ <property name="install.path" value="$INSTALL_PATH"/>
+ <target name="download-jboss"/>
+ </antcall>
+ </pack>
+ <pack name="Download Eclipse-3.4.0">
+ <antcall order="afterpack" buildfile="$INSTALL_PATH/Uninstaller/download-helper.xml">
+ <property name="install.path" value="$INSTALL_PATH"/>
+ <target name="download-eclipse"/>
+ </antcall>
+ </pack>
+</antactions>
\ No newline at end of file
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/resources/installer/ant-actions-spec.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/resources/installer/auto-install-template.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/resources/installer/auto-install-template.xml (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/resources/installer/auto-install-template.xml 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,17 @@
+<AutomatedInstallation langpack="eng">
+ <com.izforge.izpack.panels.HelloPanel />
+ <com.izforge.izpack.panels.TargetPanel>
+ <installpath>@user.home@/jboss-osgi- at product.version@</installpath>
+ </com.izforge.izpack.panels.TargetPanel>
+ <com.izforge.izpack.panels.TreePacksPanel>
+ <pack name="JBoss OSGi Integration" index="0" selected="true" />
+ </com.izforge.izpack.panels.TreePacksPanel>
+ <com.izforge.izpack.panels.UserInputPanel>
+ <userInput>
+ <entry key="jbossInstallPath" value="@jboss.home@" />
+ </userInput>
+ </com.izforge.izpack.panels.UserInputPanel>
+ <com.izforge.izpack.panels.SummaryPanel />
+ <com.izforge.izpack.panels.InstallPanel />
+ <com.izforge.izpack.panels.FinishPanel />
+</AutomatedInstallation>
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/resources/installer/auto-install-template.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/resources/installer/install-definition.xml (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/resources/installer/install-definition.xml 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
+<installation version="1.0">
+ <!--
+ Ant properties in this file can be referenced with @{},
+ otherwise use variables below in installer files with ${}
+ -->
+ <info>
+ <appname>@{product.name}</appname>
+ <appversion>@{product.version}</appversion>
+ <uninstaller name="remove.task" write="yes" />
+ </info>
+ <guiprefs width="600" height="440" resizable="yes">
+ <!--
+ <laf name="kunststoff">
+ <os family="unix" />
+ </laf>
+ -->
+ </guiprefs>
+ <locale>
+ <langpack iso3="eng" />
+ </locale>
+
+ <!-- Resources -->
+ <resources>
+ <res id="userInputSpec.xml" src="@{filtered.resources.dir}/user-input-spec.xml" />
+ <res id="TargetPanel.dir" src="@{filtered.resources.dir}/target-panel-dir.txt" />
+ </resources>
+
+ <!-- Variables -->
+ <variables>
+ <variable name="jboss.home" value="@{jboss500.home}" />
+ </variables>
+
+ <!-- Dynamic Variables -->
+ <dynamicvariables>
+ </dynamicvariables>
+
+ <!-- Conditions -->
+ <conditions>
+ </conditions>
+
+ <!-- Panels -->
+ <panels>
+ <panel classname="HelloPanel" />
+ <panel classname="TargetPanel" />
+ <panel classname="TreePacksPanel" />
+ <panel classname="UserInputPanel" />
+ <panel classname="SummaryPanel" />
+ <panel classname="InstallPanel" />
+ <panel classname="FinishPanel" />
+ </panels>
+
+ <!-- Packs -->
+ <packs>
+
+ <!--
+ ********************************
+ * *
+ * JBoss Integration *
+ * *
+ ********************************
+ -->
+
+ <pack name="JBoss OSGi Integration" required="no" preselected="yes">
+
+ <description>The JBoss OSGi Integration</description>
+
+ <!-- osgi/osgi-integration.beans -->
+ <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi/osgi.beans" override="true">
+ <include name="javax.servlet.jar" />
+ <include name="jboss-osgi-spi.jar" />
+ <include name="jboss-osgi-felix.jar" />
+ <include name="jboss-osgi-service-http.jar" />
+ <include name="jboss-osgi-service-http-beans.jar" />
+ <include name="org.apache.felix.framework.jar" />
+ <include name="org.apache.felix.webconsole.bundle" />
+ <include name="org.osgi.compendium.jar" />
+ <include name="org.osgi.core.jar" />
+ <include name="org.osgi.foundation.jar" />
+ </fileset>
+ <fileset dir="@{deploy.artifacts.dir}/resources/jboss-osgi-felix-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi/osgi.beans/META-INF" override="true">
+ <include name="jboss-beans.xml" />
+ </fileset>
+
+ </pack>
+
+ <!--
+ ********************************
+ * *
+ * Optional Components *
+ * *
+ ********************************
+ -->
+
+ </packs>
+</installation>
\ No newline at end of file
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/resources/installer/install-definition.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/resources/installer/target-panel-dir.txt
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/resources/installer/target-panel-dir.txt (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/resources/installer/target-panel-dir.txt 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1 @@
+$USER_HOME/jbpm- at product.version@
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/resources/installer/target-panel-dir.txt
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/resources/installer/user-input-spec.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/resources/installer/user-input-spec.xml (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/resources/installer/user-input-spec.xml 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,11 @@
+<userInput>
+ <panel order="0">
+ <createForPack name="JBoss OSGi Integration" />
+ <field type="dir" align="left" variable="jbossInstallPath">
+ <spec txt="JBoss Home:" size="25" set="${jboss.home}" />
+ </field>
+ <field type="text" variable="jbossTargetServer">
+ <spec txt="Server:" size="15" set="web" />
+ </field>
+ </panel>
+</userInput>
\ No newline at end of file
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/distribution/src/main/resources/installer/user-input-spec.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/felix/.classpath
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/felix/.classpath (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/felix/.classpath 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: projects/jboss-osgi/branches/tdiesler/modules/felix/.project
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/felix/.project (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/felix/.project 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jboss-osgi-felix</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: projects/jboss-osgi/branches/tdiesler/modules/felix/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/felix/pom.xml (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/felix/pom.xml 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+
+ <name>JBoss OSGi - Integration Felix</name>
+ <description>JBoss OSGi - Apache Felix Integration</description>
+
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-felix</artifactId>
+ <packaging>jar</packaging>
+
+ <parent>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-integration</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <!-- Properties -->
+ <properties>
+ </properties>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-spi</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ </dependency>
+
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <!-- Build -->
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>${project.build.finalName}</finalName>
+ <appendAssemblyId>true</appendAssemblyId>
+ <descriptors>
+ <descriptor>scripts/assembly-config.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>*beans.xml</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/felix/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/felix/scripts/assembly-config.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/felix/scripts/assembly-config.xml (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/felix/scripts/assembly-config.xml 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,17 @@
+<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+ <id>config</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.outputDirectory}</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>*beans.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/felix/scripts/assembly-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/felix/src/main/java/org/jboss/osgi/felix/framework/BundleDeployer.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/felix/src/main/java/org/jboss/osgi/felix/framework/BundleDeployer.java (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/felix/src/main/java/org/jboss/osgi/felix/framework/BundleDeployer.java 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,79 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.felix.framework;
+
+//$Id$
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * An abstraction of an OSGi Framework
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 23-Jan-2009
+ */
+public class BundleDeployer
+{
+ // Provide logging
+ final Logger log = LoggerFactory.getLogger(BundleDeployer.class);
+
+ private BundleContext bundleContext;
+ private List<String> bundles = new ArrayList<String>();
+
+ public void setBundleContext(BundleContext bundleContext)
+ {
+ this.bundleContext = bundleContext;
+ }
+
+ public void setBundles(List<String> autoStart)
+ {
+ this.bundles = autoStart;
+ }
+
+ public void start()
+ {
+ // Add auto start bundles
+ if (bundles.size() > 0)
+ {
+ for (String location : bundles)
+ {
+ try
+ {
+ Bundle bundle = bundleContext.installBundle(location);
+ bundle.start();
+ log.info("Start bundle: " + bundle.getSymbolicName());
+ }
+ catch (BundleException ex)
+ {
+ log.error("Cannot start bundle: " + location, ex);
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/felix/src/main/java/org/jboss/osgi/felix/framework/BundleDeployer.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,162 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.felix.framework;
+
+//$Id$
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.felix.framework.Felix;
+import org.jboss.osgi.spi.FrameworkException;
+import org.jboss.osgi.spi.framework.OSGiFramework;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * An abstraction of an OSGi Framework
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 23-Jan-2009
+ */
+public class FelixIntegration implements OSGiFramework
+{
+ // Provide logging
+ final Logger log = LoggerFactory.getLogger(FelixIntegration.class);
+
+ private Map<String, String> felixProperties = new HashMap<String, String>();
+ private List<String> autoInstall = new ArrayList<String>();
+ private List<String> autoStart = new ArrayList<String>();
+
+ private Felix felix;
+
+ public void setFelixProperties(Map<String, String> props)
+ {
+ this.felixProperties = props;
+ }
+
+ public void setAutoInstall(List<String> autoInstall)
+ {
+ this.autoInstall = autoInstall;
+ }
+
+ public void setAutoStart(List<String> autoStart)
+ {
+ this.autoStart = autoStart;
+ }
+
+ @Override
+ public Bundle getSystemBundle()
+ {
+ return felix;
+ }
+
+ @Override
+ public BundleContext getSystemBundleContext()
+ {
+ return getSystemBundle().getBundleContext();
+ }
+
+ public void create()
+ {
+ String implVersion = getClass().getPackage().getImplementationVersion();
+ log.info("OSGi Integration Felix - " + implVersion);
+
+ // When a Felix instance is embedded in a host application,
+ // the host application must inform the Felix instance that it is embedded
+ felixProperties.put("felix.embedded.execution", "true");
+
+ // Init & Start the System Bundle
+ try
+ {
+ felix = new Felix(felixProperties);
+ felix.start();
+ }
+ catch (BundleException ex)
+ {
+ throw new FrameworkException("Cannot initialze system bundle", ex);
+ }
+ }
+
+ public void start()
+ {
+ // Get system bundle context
+ BundleContext context = felix.getBundleContext();
+ if (context == null)
+ throw new FrameworkException("Cannot obtain system context");
+
+ // Add auto install bundles
+ if (autoInstall.size() > 0)
+ {
+ for (String location : autoInstall)
+ {
+ try
+ {
+ Bundle bundle = context.installBundle(location);
+ log.info("Install bundle: " + bundle.getSymbolicName());
+ }
+ catch (BundleException ex)
+ {
+ log.error("Cannot install bundle: " + location, ex);
+ }
+ }
+ }
+
+ // Add auto start bundles
+ if (autoStart.size() > 0)
+ {
+ for (String location : autoStart)
+ {
+ try
+ {
+ Bundle bundle = context.installBundle(location);
+ bundle.start();
+ log.info("Start bundle: " + bundle.getSymbolicName());
+ }
+ catch (BundleException ex)
+ {
+ log.error("Cannot start bundle: " + location, ex);
+ }
+ }
+ }
+ }
+
+ public void stop()
+ {
+ if (felix != null)
+ {
+ try
+ {
+ felix.stop();
+ }
+ catch (BundleException ex)
+ {
+ log.error("Cannot stop Felix", ex);
+ }
+ }
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/felix/src/main/resources/jboss-beans.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/felix/src/main/resources/jboss-beans.xml (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/felix/src/main/resources/jboss-beans.xml 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,65 @@
+<!--
+ $Id$
+-->
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- Locate the single instance of the kernel -->
+ <bean name="jboss.osgi:service=KernelLocator" class="org.jboss.osgi.spi.internal.KernelLocator">
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property>
+ </bean>
+
+ <!-- The OSGiFramework -->
+ <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.felix.framework.FelixIntegration">
+ <property name="felixProperties">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry><key>felix.cache.rootdir</key><value>${jboss.server.data.dir}</value></entry>
+ <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
+ <entry>
+ <key>org.osgi.framework.system.packages</key>
+ <value>
+ javax.servlet,
+ javax.servlet.http,
+ javax.xml.parsers,
+ org.jboss.deployers.client.plugins.deployment,
+ org.jboss.deployers.client.spi,
+ org.jboss.deployers.spi.attachments,
+ org.jboss.deployers.spi.structure,
+ org.jboss.metadata.javaee.support,
+ org.jboss.metadata.web.jboss,
+ org.jboss.metadata.web.spec,
+ org.jboss.osgi.service.http.beans,
+ org.osgi.framework; version=1.4,
+ org.xml.sax
+ </value>
+ </entry>
+ </map>
+ </property>
+ <property name="autoInstall">
+ <list elementClass="java.lang.String">
+ <value>${jboss.server.home.url}/deploy/osgi/osgi.beans/javax.servlet.jar</value>
+ <value>${jboss.server.home.url}/deploy/osgi/osgi.beans/org.osgi.compendium.jar</value>
+ </list>
+ </property>
+ </bean>
+
+ <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.service.MicrocontainerService">
+ <property name="bundleContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext"/></property>
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property>
+ </bean>
+
+ <bean name="jboss.osgi:service=WebAppGenerator" class="org.jboss.osgi.service.http.beans.WebAppGeneratorService">
+ <property name="bundleContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext"/></property>
+ <property name="mainDeployer"><inject bean="MainDeployer"/></property>
+ </bean>
+
+ <bean name="jboss.osgi:service=BundleDeployer" class="org.jboss.osgi.felix.framework.BundleDeployer">
+ <property name="bundleContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext"/></property>
+ <property name="bundles">
+ <list elementClass="java.lang.String">
+ <value>${jboss.server.home.url}/deploy/osgi/osgi.beans/org.apache.felix.webconsole.bundle</value>
+ <value>${jboss.server.home.url}/deploy/osgi/osgi.beans/jboss-osgi-service-http.jar</value>
+ </list>
+ </property>
+ </bean>
+
+</deployment>
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/felix/src/main/resources/jboss-beans.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/felix/src/main/resources/org.jboss.osgi.spi.framework.ConfigurationProvider
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/felix/src/main/resources/org.jboss.osgi.spi.framework.ConfigurationProvider (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/felix/src/main/resources/org.jboss.osgi.spi.framework.ConfigurationProvider 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1 @@
+org.jboss.osgi.spi.internal.MicrocontainerConfigurationProvider
\ No newline at end of file
Added: projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/osgi/felix/microcontainer/ConfiguredService.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/osgi/felix/microcontainer/ConfiguredService.java (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/osgi/felix/microcontainer/ConfiguredService.java 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.felix.microcontainer;
+
+//$Id$
+
+import org.osgi.framework.BundleContext;
+
+/**
+ * An OSGi Service that is defined as an mc bean
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 23-Jan-2009
+ */
+public class ConfiguredService
+{
+ private BundleContext bundleContext;
+ private MyBean testBean;
+
+ public void setBundleContext(BundleContext bundleContext)
+ {
+ this.bundleContext = bundleContext;
+ }
+
+ public void setTestBean(MyBean myBean)
+ {
+ this.testBean = myBean;
+ }
+
+ public String callBean(String msg)
+ {
+ return testBean.echo(msg);
+ }
+
+ public void start()
+ {
+ // Register this bean as an OSGi service when the bean is started
+ bundleContext.registerService(ConfiguredService.class.getName(), this, null);
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/osgi/felix/microcontainer/ConfiguredService.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/osgi/felix/microcontainer/ConfiguredServiceTest.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/osgi/felix/microcontainer/ConfiguredServiceTest.java (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/osgi/felix/microcontainer/ConfiguredServiceTest.java 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,77 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.felix.microcontainer;
+
+//$Id$
+
+import junit.framework.Test;
+
+import org.jboss.osgi.spi.framework.Configuration;
+import org.jboss.osgi.spi.framework.ConfigurationProvider;
+import org.jboss.osgi.spi.framework.OSGiFramework;
+import org.jboss.osgi.spi.test.OSGiTestCase;
+import org.jboss.osgi.spi.test.OSGiTestSetup;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+
+/**
+ * Test OSGi Framework integration with the Microcontainer
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 23-Jan-2009
+ */
+public class ConfiguredServiceTest extends OSGiTestCase
+{
+ private static OSGiFramework framework;
+
+ public static Test suite()
+ {
+ Test setup = new OSGiTestSetup(ConfiguredServiceTest.class)
+ {
+ @Override
+ protected void setUp() throws Exception
+ {
+ ConfigurationProvider provider = Configuration.getConfigurationProvider();
+ provider.configure(getResourceURL("microcontainer/configured-service-test.xml"));
+ framework = provider.getFramework();
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ framework = null;
+ }
+ };
+ return setup;
+ }
+
+ public void testServiceCallsBean()
+ {
+ BundleContext bundleContext = framework.getSystemBundleContext();
+ ServiceReference sref = bundleContext.getServiceReference(ConfiguredService.class.getName());
+ ConfiguredService service = (ConfiguredService)bundleContext.getService(sref);
+ assertNotNull("ConfiguredService not null", service);
+
+ String retStr = service.callBean("kermit");
+ assertEquals("kermit", retStr);
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/osgi/felix/microcontainer/ConfiguredServiceTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/osgi/felix/microcontainer/ExplicitService.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/osgi/felix/microcontainer/ExplicitService.java (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/osgi/felix/microcontainer/ExplicitService.java 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.felix.microcontainer;
+
+//$Id$
+
+import org.jboss.osgi.service.MicrocontainerService;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+
+/**
+ * An OSGi Service that is dynamically registered
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 23-Jan-2009
+ */
+public class ExplicitService
+{
+ private BundleContext context;
+
+ public ExplicitService(BundleContext context)
+ {
+ this.context = context;
+ }
+
+ /**
+ * Calls 'echo' on the IntegrationBean
+ */
+ public String callBean(String msg)
+ {
+ ServiceReference sref = context.getServiceReference(MicrocontainerService.class.getName());
+ MicrocontainerService mcService = (MicrocontainerService)context.getService(sref);
+ MyBean bean = (MyBean)mcService.getRegisteredBean("MyBean");
+ return bean.echo(msg);
+ }
+
+ public String echo(String msg)
+ {
+ return msg;
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/osgi/felix/microcontainer/ExplicitService.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/osgi/felix/microcontainer/ExplicitServiceTest.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/osgi/felix/microcontainer/ExplicitServiceTest.java (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/osgi/felix/microcontainer/ExplicitServiceTest.java 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,106 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.felix.microcontainer;
+
+//$Id$
+
+import junit.framework.Test;
+
+import org.jboss.osgi.service.MicrocontainerService;
+import org.jboss.osgi.spi.framework.Configuration;
+import org.jboss.osgi.spi.framework.ConfigurationProvider;
+import org.jboss.osgi.spi.framework.OSGiFramework;
+import org.jboss.osgi.spi.test.OSGiTestCase;
+import org.jboss.osgi.spi.test.OSGiTestSetup;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+
+/**
+ * Test OSGi Framework integration with the Microcontainer
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 23-Jan-2009
+ */
+public class ExplicitServiceTest extends OSGiTestCase
+{
+ private static OSGiFramework framework;
+
+ public static Test suite()
+ {
+ Test setup = new OSGiTestSetup(ExplicitServiceTest.class)
+ {
+ @Override
+ protected void setUp() throws Exception
+ {
+ ConfigurationProvider provider = Configuration.getConfigurationProvider();
+ provider.configure(getResourceURL("microcontainer/explicit-service-test.xml"));
+ framework = provider.getFramework();
+
+ // Register IntegrationService
+ BundleContext context = framework.getSystemBundleContext();
+ context.registerService(ExplicitService.class.getName(), new ExplicitService(context), null);
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ framework = null;
+ }
+ };
+ return setup;
+ }
+
+ public void testBeanCallsService()
+ {
+ MyBean bean = getBean();
+ assertNotNull("MyBean not null", bean);
+
+ String retStr = bean.callService("kermit");
+ assertEquals("kermit", retStr);
+ }
+
+ public void testServiceCallsBean()
+ {
+ ExplicitService service = getService();
+ assertNotNull("DynamicService not null", service);
+
+ String retStr = service.callBean("kermit");
+ assertEquals("kermit", retStr);
+ }
+
+ private ExplicitService getService()
+ {
+ BundleContext bundleContext = framework.getSystemBundleContext();
+ ServiceReference sref = bundleContext.getServiceReference(ExplicitService.class.getName());
+ ExplicitService service = (ExplicitService)bundleContext.getService(sref);
+ return service;
+ }
+
+ private MyBean getBean()
+ {
+ BundleContext context = framework.getSystemBundleContext();
+ ServiceReference sref = context.getServiceReference(MicrocontainerService.class.getName());
+ MicrocontainerService mcService = (MicrocontainerService)context.getService(sref);
+ MyBean bean = (MyBean)mcService.getRegisteredBean("MyBean");
+ return bean;
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/osgi/felix/microcontainer/ExplicitServiceTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/osgi/felix/microcontainer/MyBean.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/osgi/felix/microcontainer/MyBean.java (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/osgi/felix/microcontainer/MyBean.java 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.felix.microcontainer;
+
+//$Id$
+
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+
+public class MyBean
+{
+ private BundleContext bundleContext;
+
+ public void setBundleContext(BundleContext bundleContext)
+ {
+ this.bundleContext = bundleContext;
+ }
+
+ /**
+ * Calls 'echo' on the DynamicService
+ */
+ public String callService(String msg)
+ {
+ ServiceReference sref = bundleContext.getServiceReference(ExplicitService.class.getName());
+ ExplicitService service = (ExplicitService)bundleContext.getService(sref);
+ return service.echo(msg);
+ }
+
+ public String echo(String msg)
+ {
+ return msg;
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/osgi/felix/microcontainer/MyBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/osgi/felix/system/SystemBundleTest.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/osgi/felix/system/SystemBundleTest.java (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/osgi/felix/system/SystemBundleTest.java 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.felix.system;
+
+//$Id$
+
+import org.jboss.osgi.spi.framework.Configuration;
+import org.jboss.osgi.spi.framework.OSGiFramework;
+import org.jboss.osgi.spi.test.OSGiTestCase;
+import org.osgi.framework.Bundle;
+
+/**
+ * Test OSGi System bundle access
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 23-Jan-2009
+ */
+public class SystemBundleTest extends OSGiTestCase
+{
+ public void testSystemBundle()
+ {
+ OSGiFramework framework = Configuration.getFramework();
+ Bundle bundle = framework.getSystemBundle();
+
+ assertEquals("BundleId == 0", 0, bundle.getBundleId());
+ assertEquals("SymbolicName == system.bundle", "system.bundle", bundle.getSymbolicName());
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/java/org/jboss/osgi/felix/system/SystemBundleTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/resources/jboss-osgi-beans.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/resources/jboss-osgi-beans.xml (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/resources/jboss-osgi-beans.xml 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,20 @@
+<!--
+ $Id$
+-->
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- The OSGiFramework -->
+ <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.felix.framework.FelixIntegration">
+ <property name="felixProperties">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
+ </map>
+ </property>
+ </bean>
+
+ <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.service.MicrocontainerService">
+ <property name="bundleContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext"/></property>
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property>
+ </bean>
+
+</deployment>
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/resources/jboss-osgi-beans.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/resources/log4j.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/resources/log4j.xml (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/resources/log4j.xml 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <!-- ================================= -->
+ <!-- Preserve messages in a local file -->
+ <!-- ================================= -->
+
+ <appender name="FILE" class="org.apache.log4j.FileAppender">
+ <param name="File" value="${log4j.output.dir}/test.log"/>
+ <param name="Append" value="false"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <param name="Target" value="System.out" />
+ <param name="Threshold" value="INFO" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n" />
+ </layout>
+ </appender>
+
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+
+ <category name="org.hibernate">
+ <priority value="INFO" />
+ </category>
+ <category name="org.hibernate.SQL">
+ <priority value="DEBUG" />
+ </category>
+ <category name="org.hibernate.connection">
+ <priority value="TRACE" />
+ </category>
+
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <!--appender-ref ref="CONSOLE"/-->
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/resources/log4j.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/resources/microcontainer/configured-service-test.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/resources/microcontainer/configured-service-test.xml (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/resources/microcontainer/configured-service-test.xml 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,23 @@
+<!--
+ $Id$
+-->
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.felix.framework.FelixIntegration">
+ </bean>
+
+ <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.service.MicrocontainerService">
+ <property name="bundleContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext"/></property>
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property>
+ </bean>
+
+ <bean name="MyBean" class="org.jboss.osgi.felix.microcontainer.MyBean">
+ <property name="bundleContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext"/></property>
+ </bean>
+
+ <bean name="ConfiguredService" class="org.jboss.osgi.felix.microcontainer.ConfiguredService">
+ <property name="bundleContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext"/></property>
+ <property name="testBean"><inject bean="MyBean"/></property>
+ </bean>
+
+</deployment>
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/resources/microcontainer/configured-service-test.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/resources/microcontainer/explicit-service-test.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/resources/microcontainer/explicit-service-test.xml (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/resources/microcontainer/explicit-service-test.xml 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,18 @@
+<!--
+ $Id$
+-->
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.felix.framework.FelixIntegration">
+ </bean>
+
+ <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.service.MicrocontainerService">
+ <property name="bundleContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext"/></property>
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property>
+ </bean>
+
+ <bean name="MyBean" class="org.jboss.osgi.felix.microcontainer.MyBean">
+ <property name="bundleContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext"/></property>
+ </bean>
+
+</deployment>
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/felix/src/test/resources/microcontainer/explicit-service-test.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/service/http/.classpath
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/service/http/.classpath (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/service/http/.classpath 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: projects/jboss-osgi/branches/tdiesler/modules/service/http/.project
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/service/http/.project (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/service/http/.project 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jboss-osgi-service-http</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: projects/jboss-osgi/branches/tdiesler/modules/service/http/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/service/http/pom.xml (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/service/http/pom.xml 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+
+ <name>JBoss OSGi - Service HTTP</name>
+
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-service-http</artifactId>
+ <packaging>bundle</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-service</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <!-- Properties -->
+ <properties>
+ </properties>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-service-http-beans</artifactId>
+ <version>${version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>org.jboss.osgi.service.http</Bundle-SymbolicName>
+ <Private-Package>org.jboss.osgi.service.http</Private-Package>
+ <Bundle-Activator>org.jboss.osgi.service.http.Activator</Bundle-Activator>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/service/http/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/service/http/src/main/java/org/jboss/osgi/service/http/Activator.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/service/http/src/main/java/org/jboss/osgi/service/http/Activator.java (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/service/http/src/main/java/org/jboss/osgi/service/http/Activator.java 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.service.http;
+
+//$Id$
+
+import java.util.Properties;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.service.http.HttpService;
+
+/**
+ * An implementation of the HTTP Service Specification
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 23-Jan-2009
+ */
+public class Activator implements BundleActivator
+{
+ /*
+ * Implements BundleActivator.start().
+ * Registers an instance of a HTTP Service using the bundle context.
+ */
+ public void start(BundleContext context)
+ {
+ Properties props = new Properties();
+ context.registerService(HttpService.class.getName(), new HttpServiceImpl(context), props);
+ }
+
+ /*
+ * Implements BundleActivator.stop().
+ * Does nothing since the framework will automatically unregister any registered services.
+ */
+ public void stop(BundleContext context)
+ {
+ // NOTE: The service is automatically unregistered.
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/service/http/src/main/java/org/jboss/osgi/service/http/Activator.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/service/http/src/main/java/org/jboss/osgi/service/http/HttpContextImpl.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/service/http/src/main/java/org/jboss/osgi/service/http/HttpContextImpl.java (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/service/http/src/main/java/org/jboss/osgi/service/http/HttpContextImpl.java 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.service.http;
+
+//$Id$
+
+import java.io.IOException;
+import java.net.URL;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.osgi.service.http.HttpContext;
+
+/**
+ * An implementation of the HTTPContext
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 23-Jan-2009
+ */
+public class HttpContextImpl implements HttpContext
+{
+ public String getMimeType(String name)
+ {
+ throw new NotImplementedException();
+ }
+
+ public URL getResource(String name)
+ {
+ throw new NotImplementedException();
+ }
+
+ public boolean handleSecurity(HttpServletRequest req, HttpServletResponse res) throws IOException
+ {
+ throw new NotImplementedException();
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/service/http/src/main/java/org/jboss/osgi/service/http/HttpContextImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/service/http/src/main/java/org/jboss/osgi/service/http/HttpServiceException.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/service/http/src/main/java/org/jboss/osgi/service/http/HttpServiceException.java (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/service/http/src/main/java/org/jboss/osgi/service/http/HttpServiceException.java 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.service.http;
+
+// $Id$
+
+/**
+ * A RuntimeException that should be thrown for unrecoverable HttpService errors
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 26-Jan-2009
+ */
+ at SuppressWarnings("serial")
+public class HttpServiceException extends RuntimeException
+{
+ public HttpServiceException(String message)
+ {
+ super(message);
+ }
+
+ public HttpServiceException(String message, Exception cause)
+ {
+ super(message, cause);
+ }
+}
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/service/http/src/main/java/org/jboss/osgi/service/http/HttpServiceException.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/service/http/src/main/java/org/jboss/osgi/service/http/HttpServiceImpl.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/service/http/src/main/java/org/jboss/osgi/service/http/HttpServiceImpl.java (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/service/http/src/main/java/org/jboss/osgi/service/http/HttpServiceImpl.java 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,78 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.service.http;
+
+//$Id$
+
+import java.util.Dictionary;
+
+import javax.servlet.Servlet;
+import javax.servlet.ServletException;
+
+import org.jboss.osgi.service.http.beans.WebAppGeneratorService;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.http.HttpContext;
+import org.osgi.service.http.HttpService;
+import org.osgi.service.http.NamespaceException;
+
+/**
+ * An implementation of the HTTP Service Specification
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 23-Jan-2009
+ */
+public class HttpServiceImpl implements HttpService
+{
+ private BundleContext bundleContext;
+
+ public HttpServiceImpl(BundleContext context)
+ {
+ this.bundleContext = context;
+ }
+
+ public HttpContext createDefaultHttpContext()
+ {
+ return new HttpContextImpl();
+ }
+
+ public void registerResources(String alias, String name, HttpContext context) throws NamespaceException
+ {
+ throw new NotImplementedException();
+ }
+
+ @SuppressWarnings("unchecked")
+ public void registerServlet(String alias, Servlet servlet, Dictionary initParams, HttpContext httpContext) throws ServletException, NamespaceException
+ {
+ if (httpContext == null)
+ httpContext = createDefaultHttpContext();
+
+ ServiceReference sref = bundleContext.getServiceReference(WebAppGeneratorService.class.getName());
+ WebAppGeneratorService webappService = (WebAppGeneratorService)bundleContext.getService(sref);
+ webappService.registerServlet(alias, servlet, initParams);
+ }
+
+ public void unregister(String alias)
+ {
+ throw new NotImplementedException();
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/service/http/src/main/java/org/jboss/osgi/service/http/HttpServiceImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/service/http/src/main/java/org/jboss/osgi/service/http/NotImplementedException.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/service/http/src/main/java/org/jboss/osgi/service/http/NotImplementedException.java (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/service/http/src/main/java/org/jboss/osgi/service/http/NotImplementedException.java 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.service.http;
+
+// $Id$
+
+/**
+ * A RuntimeException that should be thrown for unimplemented features
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 18-Jun-2008
+ */
+ at SuppressWarnings("serial")
+public class NotImplementedException extends RuntimeException
+{
+ public NotImplementedException()
+ {
+ }
+
+ public NotImplementedException(String message)
+ {
+ super(message);
+ }
+
+ public NotImplementedException(String jiraIssue, String message)
+ {
+ super("[" + jiraIssue + "] " + message);
+ }
+}
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/service/http/src/main/java/org/jboss/osgi/service/http/NotImplementedException.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/service/http-beans/.classpath
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/service/http-beans/.classpath (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/service/http-beans/.classpath 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: projects/jboss-osgi/branches/tdiesler/modules/service/http-beans/.project
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/service/http-beans/.project (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/service/http-beans/.project 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jboss-osgi-service-http-beans</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: projects/jboss-osgi/branches/tdiesler/modules/service/http-beans/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/service/http-beans/pom.xml (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/service/http-beans/pom.xml 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+
+ <name>JBoss OSGi - Service HTTP Beans</name>
+
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-service-http-beans</artifactId>
+ <packaging>jar</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-service</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <!-- Properties -->
+ <properties>
+ </properties>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>javax.servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client-spi</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-structure-spi</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ </plugins>
+ </build>
+</project>
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/service/http-beans/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/service/http-beans/src/main/java/org/jboss/osgi/service/http/beans/WebAppGeneratorService.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/service/http-beans/src/main/java/org/jboss/osgi/service/http/beans/WebAppGeneratorService.java (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/service/http-beans/src/main/java/org/jboss/osgi/service/http/beans/WebAppGeneratorService.java 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,144 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.service.http.beans;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Dictionary;
+import java.util.List;
+
+import javax.servlet.Servlet;
+
+import org.jboss.deployers.client.plugins.deployment.AbstractDeployment;
+import org.jboss.deployers.client.spi.DeployerClient;
+import org.jboss.deployers.client.spi.DeploymentFactory;
+import org.jboss.deployers.spi.attachments.MutableAttachments;
+import org.jboss.deployers.structure.spi.ClassLoaderFactory;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.metadata.web.jboss.JBossServletMetaData;
+import org.jboss.metadata.web.jboss.JBossServletsMetaData;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.metadata.web.spec.ServletMappingMetaData;
+import org.osgi.framework.BundleContext;
+
+/**
+ * Generates a webapp for a HttpService servlet registration
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 26-Jan-2009
+ */
+public class WebAppGeneratorService
+{
+ private BundleContext bundleContext;
+ private DeployerClient mainDeployer;
+
+ private DeploymentFactory factory = new DeploymentFactory();
+
+ public void setBundleContext(BundleContext bundleContext)
+ {
+ this.bundleContext = bundleContext;
+ }
+
+ public void setMainDeployer(DeployerClient mainDeployer)
+ {
+ this.mainDeployer = mainDeployer;
+ }
+
+ public void registerServlet(String alias, Servlet servlet, Dictionary<String, String> initParams)
+ {
+ JBossWebMetaData jbwmd = generatWebDeployment(alias, servlet);
+
+ try
+ {
+ AbstractDeployment deployment = new AbstractDeployment(alias);
+ factory.addContext(deployment, "");
+
+ ClassLoader classLoader = servlet.getClass().getClassLoader();
+
+ MutableAttachments mutableAttachments = (MutableAttachments)deployment.getPredeterminedManagedObjects();
+ mutableAttachments.addAttachment(ClassLoaderFactory.class, new ContextClassLoaderFactory(classLoader));
+ mutableAttachments.addAttachment(JBossWebMetaData.class, jbwmd);
+ mainDeployer.deploy(deployment);
+ }
+ catch (Exception ex)
+ {
+ throw new IllegalStateException("Cannot create webapp: " + alias, ex);
+ }
+ }
+
+ public JBossWebMetaData generatWebDeployment(String alias, Servlet servletImpl)
+ {
+ String servletName = alias;
+ String servletClass = servletImpl.getClass().getName();
+
+ /*
+ * <servlet> <servlet-name> <servlet-class> </servlet>
+ */
+ JBossWebMetaData jbwmd = new JBossWebMetaData();
+ JBossServletsMetaData servlets = jbwmd.getServlets();
+ JBossServletMetaData servlet = new JBossServletMetaData();
+ servlet.setServletName(servletName);
+ servlet.setServletClass(servletClass);
+ servlets.add(servlet);
+
+ /*
+ * <servlet-mapping> <servlet-name> <url-pattern> </servlet-mapping>
+ */
+ List<ServletMappingMetaData> servletMappings = jbwmd.getServletMappings();
+ if (servletMappings == null)
+ {
+ servletMappings = new ArrayList<ServletMappingMetaData>();
+ jbwmd.setServletMappings(servletMappings);
+ }
+ ServletMappingMetaData servletMapping = new ServletMappingMetaData();
+ servletMapping.setServletName(servletName);
+ servletMapping.setUrlPatterns(Arrays.asList(new String[] { "/*" }));
+ servletMappings.add(servletMapping);
+
+ return jbwmd;
+ }
+
+ // Register this bean as an OSGi service
+ public void create()
+ {
+ bundleContext.registerService(WebAppGeneratorService.class.getName(), this, null);
+ }
+
+ private static class ContextClassLoaderFactory implements ClassLoaderFactory
+ {
+ private ClassLoader classLoader;
+
+ public ContextClassLoaderFactory(ClassLoader classLoader)
+ {
+ this.classLoader = classLoader;
+ }
+
+ public ClassLoader createClassLoader(DeploymentUnit unit) throws Exception
+ {
+ return classLoader;
+ }
+
+ public void removeClassLoader(DeploymentUnit unit) throws Exception
+ {
+ }
+ }
+}
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/service/http-beans/src/main/java/org/jboss/osgi/service/http/beans/WebAppGeneratorService.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/service/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/service/pom.xml (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/service/pom.xml 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+
+ <name>JBoss OSGi - Service</name>
+ <description>JBoss OSGi - Service</description>
+
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-service</artifactId>
+ <packaging>pom</packaging>
+
+ <parent>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-integration</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <modules>
+ <module>http</module>
+ <module>http-beans</module>
+ </modules>
+
+</project>
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/service/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/spi/.classpath
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/spi/.classpath (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/spi/.classpath 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: projects/jboss-osgi/branches/tdiesler/modules/spi/.project
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/spi/.project (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/spi/.project 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jboss-osgi-spi</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: projects/jboss-osgi/branches/tdiesler/modules/spi/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/spi/pom.xml (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/spi/pom.xml 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+
+ <name>JBoss OSGi - Integration SPI</name>
+ <description>JBoss OSGi - Service Provider Interface</description>
+
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-spi</artifactId>
+ <packaging>jar</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-integration</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/spi/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/service/MicrocontainerService.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/service/MicrocontainerService.java (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/service/MicrocontainerService.java 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.service;
+
+//$Id$
+
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.spi.registry.KernelRegistryEntry;
+import org.osgi.framework.BundleContext;
+
+/**
+ * An OSGi Service the gives access to the Microcontainer
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 23-Jan-2009
+ */
+public class MicrocontainerService
+{
+ private BundleContext bundleContext;
+ private Kernel kernel;
+
+ public void setBundleContext(BundleContext bundleContext)
+ {
+ this.bundleContext = bundleContext;
+ }
+
+ public void setKernel(Kernel kernel)
+ {
+ this.kernel = kernel;
+ }
+
+ public Kernel getKernel()
+ {
+ return kernel;
+ }
+
+ @SuppressWarnings("deprecation")
+ public Object getRegisteredBean(String beanName)
+ {
+ if (kernel == null)
+ throw new IllegalArgumentException("Kernel cannot be null");
+
+ KernelRegistryEntry entry = kernel.getRegistry().getEntry(beanName);
+ return entry.getTarget();
+ }
+
+ // Register this bean as an OSGi service
+ public void create()
+ {
+ bundleContext.registerService(MicrocontainerService.class.getName(), this, null);
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/service/MicrocontainerService.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/FrameworkException.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/FrameworkException.java (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/FrameworkException.java 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi;
+
+// $Id$
+
+/**
+ * An OSGi Framework Exception that should be thrown on unrecoverable errors.
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 18-Jan-2009
+ */
+ at SuppressWarnings("serial")
+public class FrameworkException extends RuntimeException
+{
+ public FrameworkException(String message)
+ {
+ super(message);
+ }
+
+ public FrameworkException(String message, Exception cause)
+ {
+ super(message, cause);
+ }
+
+}
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/FrameworkException.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/NotImplementedException.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/NotImplementedException.java (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/NotImplementedException.java 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi;
+
+// $Id$
+
+/**
+ * A RuntimeException that should be thrown for unimplemented features
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 18-Jun-2008
+ */
+ at SuppressWarnings("serial")
+public class NotImplementedException extends RuntimeException
+{
+ public NotImplementedException()
+ {
+ }
+
+ public NotImplementedException(String message)
+ {
+ super(message);
+ }
+
+ public NotImplementedException(String jiraIssue, String message)
+ {
+ super("[" + jiraIssue + "] " + message);
+ }
+}
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/NotImplementedException.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/ObjectNameFactory.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/ObjectNameFactory.java (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/ObjectNameFactory.java 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,74 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi;
+
+// $Id$
+
+import java.util.Hashtable;
+
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
+/**
+ * A simple factory for creating safe object names.
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 08-May-2006
+ */
+public class ObjectNameFactory
+{
+ public static ObjectName create(String name)
+ {
+ try
+ {
+ return new ObjectName(name);
+ }
+ catch (MalformedObjectNameException e)
+ {
+ throw new Error("Invalid ObjectName: " + name + "; " + e);
+ }
+ }
+
+ public static ObjectName create(String domain, String key, String value)
+ {
+ try
+ {
+ return new ObjectName(domain, key, value);
+ }
+ catch (MalformedObjectNameException e)
+ {
+ throw new Error("Invalid ObjectName: " + domain + "," + key + "," + value + "; " + e);
+ }
+ }
+
+ public static ObjectName create(String domain, Hashtable<String, String> table)
+ {
+ try
+ {
+ return new ObjectName(domain, table);
+ }
+ catch (MalformedObjectNameException e)
+ {
+ throw new Error("Invalid ObjectName: " + domain + "," + table + "; " + e);
+ }
+ }
+}
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/ObjectNameFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/framework/Configuration.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/framework/Configuration.java (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/framework/Configuration.java 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,118 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi.framework;
+
+//$Id$
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.URL;
+
+
+/**
+ * The Configuration provides a Framework through a ConfigurationProvider
+ * </p>
+ * A ConfigurationProvider is discovered in two stages
+ * <p/>
+ *
+ * <ol>
+ * <li>Read the configuration provider class name from a system property
+ * <li>Read the configuration provider class name from a resource file
+ * </ol>
+ *
+ * In both cases the key is the fully qalified name of the {@link ConfigurationProvider} interface.
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 18-Jun-2008
+ */
+public final class Configuration
+{
+ // Hide the ctor
+ private Configuration()
+ {
+ }
+
+ /*
+ * Get the OSGi Framework for this configuration
+ * @return The configured instance of a Framework
+ */
+ public static OSGiFramework getFramework()
+ {
+ return getConfigurationProvider().getFramework();
+ }
+
+ /*
+ * Get a Framework with a given name from this configuration
+ * @return The configured instance of a Framework
+ */
+ public static OSGiFramework getFramework(String frameworkName)
+ {
+ return getConfigurationProvider().getFramework(frameworkName);
+ }
+
+ /*
+ * Get the ConfigurationProvider
+ */
+ public static ConfigurationProvider getConfigurationProvider()
+ {
+ ConfigurationProvider provider;
+
+ // Get the provider name from the System property
+ String providerName = System.getProperty(ConfigurationProvider.class.getName());
+
+ // Get the provider name from the resource file
+ if (providerName == null)
+ {
+ ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
+ URL providerURL = ctxLoader.getResource(ConfigurationProvider.class.getName());
+ if (providerURL == null)
+ throw new IllegalStateException("Cannot find resource: " + ConfigurationProvider.class.getName());
+
+ try
+ {
+ providerName = new BufferedReader(new InputStreamReader(providerURL.openStream())).readLine();
+ }
+ catch (Exception e)
+ {
+ throw new IllegalStateException("Cannot read configuration provider name from: " + providerURL);
+ }
+ }
+
+ // Verify that we have a provider name
+ if (providerName == null)
+ throw new IllegalStateException("Cannot obtain configuration provider");
+
+ // Load the config provider
+ try
+ {
+ ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
+ Class<?> providerClass = ctxLoader.loadClass(providerName);
+ provider = (ConfigurationProvider)providerClass.newInstance();
+ }
+ catch (Exception e)
+ {
+ throw new IllegalStateException("Cannot load configuration provider: " + providerName);
+ }
+
+ return provider;
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/framework/Configuration.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/framework/ConfigurationProvider.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/framework/ConfigurationProvider.java (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/framework/ConfigurationProvider.java 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi.framework;
+
+//$Id$
+
+import java.io.InputStream;
+import java.net.URL;
+
+
+/**
+ * The ConfigurationProvider provides a Framework
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 18-Jun-2008
+ */
+public interface ConfigurationProvider
+{
+ /**
+ * Get a Framework from this ConfigurationProvider
+ * @return The configured instance of a Framework
+ */
+ OSGiFramework getFramework();
+
+ /**
+ * Get a Framework with a given name from this ConfigurationProvider
+ * @return The configured instance of a Framework
+ */
+ OSGiFramework getFramework(String name);
+
+ /**
+ * Configure this provider from the given URL
+ */
+ void configure(URL urlConfig);
+
+ /**
+ * Configure this provider from the resource
+ */
+ void configure(String resourceConfig);
+
+ /**
+ * Configure this provider from the resource
+ */
+ void configure(InputStream streamConfig);
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/framework/ConfigurationProvider.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiFramework.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiFramework.java (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiFramework.java 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi.framework;
+
+//$Id$
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+
+/**
+ * An abstraction of an OSGi Framework
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 23-Jan-2009
+ */
+public interface OSGiFramework
+{
+ /**
+ * Get the System Bundle associated with this Framework
+ */
+ Bundle getSystemBundle();
+
+ /**
+ * Get the System Bundle Context associated with this Framework
+ */
+ BundleContext getSystemBundleContext();
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiFramework.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/internal/EmbeddedBeansDeployer.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/internal/EmbeddedBeansDeployer.java (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/internal/EmbeddedBeansDeployer.java 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,96 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi.internal;
+
+// $Id$
+
+import java.net.URL;
+
+import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
+import org.jboss.kernel.plugins.deployment.xml.BasicXMLDeployer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Boostrap the Microcontainer
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 27-Jun-2008
+ */
+public class EmbeddedBeansDeployer extends BasicBootstrap
+{
+ // Provide logging
+ final Logger log = LoggerFactory.getLogger(EmbeddedBeansDeployer.class);
+
+ private BasicXMLDeployer deployer;
+
+ public EmbeddedBeansDeployer()
+ {
+ // Get or bootstrap the kernel
+ if (getKernel() == null)
+ {
+ try
+ {
+ super.bootstrap();
+ log.debug("bootstrap kernel: " + kernel);
+ }
+ catch (Throwable e)
+ {
+ throw new IllegalStateException("Cannot bootstrap kernel", e);
+ }
+ }
+ deployer = new BasicXMLDeployer(kernel);
+ }
+
+ /**
+ * Deploy MC beans from URL
+ */
+ public void deploy(URL url)
+ {
+ log.debug("deploy: " + url);
+ try
+ {
+ deployer.deploy(url);
+ deployer.validate();
+ }
+ catch (Throwable e)
+ {
+ throw new IllegalStateException("Cannot deploy beans from: " + url, e);
+ }
+ }
+
+ /**
+ * Undeploy MC beans from URL
+ */
+ public void undeploy(URL url)
+ {
+ log.debug("undeploy: " + url);
+ try
+ {
+ deployer.undeploy(url);
+ }
+ catch (Throwable e)
+ {
+ throw new IllegalStateException("Cannot undeploy beans from: " + url, e);
+ }
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/internal/EmbeddedBeansDeployer.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/internal/KernelLocator.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/internal/KernelLocator.java (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/internal/KernelLocator.java 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi.internal;
+
+//$Id$
+
+import org.jboss.kernel.Kernel;
+
+/**
+ * Locate the single instance of the kernel
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 12-May-2006
+ */
+public class KernelLocator
+{
+ private static Kernel kernel;
+
+ public static Kernel getKernel()
+ {
+ return KernelLocator.kernel;
+ }
+
+ public void setKernel(Kernel kernel)
+ {
+ KernelLocator.kernel = kernel;
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/internal/KernelLocator.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/internal/MicrocontainerConfigurationProvider.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/internal/MicrocontainerConfigurationProvider.java (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/internal/MicrocontainerConfigurationProvider.java 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,103 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi.internal;
+
+//$Id$
+
+import java.io.InputStream;
+import java.net.URL;
+
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.spi.registry.KernelRegistryEntry;
+import org.jboss.osgi.spi.NotImplementedException;
+import org.jboss.osgi.spi.framework.ConfigurationProvider;
+import org.jboss.osgi.spi.framework.OSGiFramework;
+
+/**
+ * The ConfigurationProvider provides a Framework through a given configuration method
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 18-Jun-2008
+ */
+public class MicrocontainerConfigurationProvider implements ConfigurationProvider
+{
+ /* The Framework bean name - jboss.osgi:service=Framework */
+ public static final String DEFAULT_BEAN_NAME = "jboss.osgi:service=Framework";
+ /* The default bean config: jboss-osgi-beans.xml */
+ public static final String DEFAULT_BEANS_CONFIG = "jboss-osgi-beans.xml";
+
+ private Kernel kernel;
+
+ @Override
+ public OSGiFramework getFramework()
+ {
+ return getFramework(DEFAULT_BEAN_NAME);
+ }
+
+ @Override
+ @SuppressWarnings("deprecation")
+ public OSGiFramework getFramework(String beanName)
+ {
+ if (kernel == null)
+ kernel = KernelLocator.getKernel();
+
+ if (kernel == null)
+ configure(DEFAULT_BEANS_CONFIG);
+
+ KernelRegistryEntry entry = kernel.getRegistry().getEntry(beanName);
+ OSGiFramework framework = (OSGiFramework)entry.getTarget();
+
+ return framework;
+ }
+
+ @Override
+ public void configure(InputStream streamConfig)
+ {
+ throw new NotImplementedException("Cannot bootstrap JBossMC from InputStream");
+ }
+
+ @Override
+ public void configure(String resourceConfig)
+ {
+ URL urlConfig = Thread.currentThread().getContextClassLoader().getResource(resourceConfig);
+ if (urlConfig == null)
+ throw new IllegalStateException("Cannot find resource: " + resourceConfig);
+
+ deploy(urlConfig);
+ }
+
+ @Override
+ public void configure(URL urlConfig)
+ {
+ deploy(urlConfig);
+ }
+
+ private void deploy(URL urlConfig)
+ {
+ EmbeddedBeansDeployer deployer = new EmbeddedBeansDeployer();
+ deployer.deploy(urlConfig);
+ kernel = deployer.getKernel();
+
+ if (kernel == null)
+ throw new IllegalStateException("Cannot obtain kernel, after beans deployment");
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/internal/MicrocontainerConfigurationProvider.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/ArchiveDeployer.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/ArchiveDeployer.java (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/ArchiveDeployer.java 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi.test;
+
+import java.net.URL;
+
+/**
+ * An archive deployer
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 16-May-2006
+ */
+public interface ArchiveDeployer
+{
+ /** Deploy the given archive
+ */
+ void deploy(URL archive) throws Exception;
+
+ /** Undeploy the given archive
+ */
+ void undeploy(URL archive) throws Exception;
+}
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/ArchiveDeployer.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/IntegrationTestCase.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/IntegrationTestCase.java (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/IntegrationTestCase.java 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,85 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi.test;
+
+// $Id$
+
+import java.net.URL;
+
+import javax.management.MBeanServerConnection;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * An integration test case
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 25-Sep-2008
+ */
+public class IntegrationTestCase extends OSGiTestCase
+{
+ // Provide logging
+ final Logger log = LoggerFactory.getLogger(IntegrationTestCase.class);
+
+ IntegrationTestHelper delegate = new IntegrationTestHelper();
+
+ public boolean isTargetJBoss500()
+ {
+ return delegate.isTargetJBoss500();
+ }
+
+ public boolean isTargetJBoss423()
+ {
+ return delegate.isTargetJBoss423();
+ }
+
+ public boolean isTargetJBoss422()
+ {
+ return delegate.isTargetJBoss422();
+ }
+
+ public void deploy(String archive) throws Exception
+ {
+ delegate.deploy(archive);
+ }
+
+ public void deploy(URL archive) throws Exception
+ {
+ delegate.deploy(archive);
+ }
+
+ public void undeploy(String archive) throws Exception
+ {
+ delegate.undeploy(archive);
+ }
+
+ public void undeploy(URL archive) throws Exception
+ {
+ delegate.undeploy(archive);
+ }
+
+ public MBeanServerConnection getServer()
+ {
+ return delegate.getServer();
+ }
+}
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/IntegrationTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/IntegrationTestHelper.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/IntegrationTestHelper.java (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/IntegrationTestHelper.java 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,136 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi.test;
+
+import java.net.URL;
+import java.util.Hashtable;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import org.jboss.osgi.spi.ObjectNameFactory;
+
+/**
+ * An integration test helper that deals with test deployment/undeployment, etc.
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 14-Oct-2004
+ */
+public class IntegrationTestHelper extends OSGiTestHelper
+{
+ private static MBeanServerConnection server;
+ private String integrationTarget;
+
+ public void deploy(String archive) throws Exception
+ {
+ URL url = getTestArchiveFile(archive).toURI().toURL();
+ deploy(url);
+ }
+
+ public void deploy(URL archive) throws Exception
+ {
+ getDeployer().deploy(archive);
+ }
+
+ public void undeploy(String archive) throws Exception
+ {
+ URL url = getTestArchiveFile(archive).toURI().toURL();
+ undeploy(url);
+ }
+
+ public void undeploy(URL archive) throws Exception
+ {
+ getDeployer().undeploy(archive);
+ }
+
+ public boolean isTargetJBoss500()
+ {
+ String target = getIntegrationTarget();
+ return target.startsWith("jboss500");
+ }
+
+ public boolean isTargetJBoss423()
+ {
+ String target = getIntegrationTarget();
+ return target.startsWith("jboss423");
+ }
+
+ public boolean isTargetJBoss422()
+ {
+ String target = getIntegrationTarget();
+ return target.startsWith("jboss422");
+ }
+
+ private String getIntegrationTarget()
+ {
+ if (integrationTarget == null)
+ {
+ String jbossVersion;
+ try
+ {
+ ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
+ jbossVersion = (String)getServer().getAttribute(oname, "SpecificationVersion");
+ }
+ catch (Exception ex)
+ {
+ throw new IllegalStateException("Cannot obtain jboss version", ex);
+ }
+
+ if (jbossVersion.startsWith("5.0.0"))
+ integrationTarget = "jboss500";
+ else if (jbossVersion.startsWith("4.2.3"))
+ integrationTarget = "jboss423";
+ else if (jbossVersion.startsWith("4.2.2"))
+ integrationTarget = "jboss422";
+ else
+ throw new IllegalStateException("Unsupported jboss version: " + jbossVersion);
+ }
+ return integrationTarget;
+ }
+
+ @SuppressWarnings("unchecked")
+ public MBeanServerConnection getServer()
+ {
+ if (server == null)
+ {
+ Hashtable jndiEnv = null;
+ try
+ {
+ InitialContext iniCtx = new InitialContext();
+ jndiEnv = iniCtx.getEnvironment();
+ server = (MBeanServerConnection)iniCtx.lookup("jmx/invoker/RMIAdaptor");
+ }
+ catch (NamingException ex)
+ {
+ throw new RuntimeException("Cannot obtain MBeanServerConnection using jndi props: " + jndiEnv, ex);
+ }
+ }
+ return server;
+ }
+
+ private ArchiveDeployer getDeployer()
+ {
+ return new JBossArchiveDeployer(getServer());
+ }
+}
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/IntegrationTestHelper.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/IntegrationTestSetup.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/IntegrationTestSetup.java (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/IntegrationTestSetup.java 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,153 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi.test;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
+
+import javax.management.MBeanServerConnection;
+
+/**
+ * A test setup that deploys/undeploys archives
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 14-Oct-2004
+ */
+public class IntegrationTestSetup extends OSGiTestSetup
+{
+ private IntegrationTestHelper delegate = new IntegrationTestHelper();
+ private String[] archives = new String[0];
+ private ClassLoader originalClassLoader;
+
+ public IntegrationTestSetup(Class<?> testClass, String archiveList)
+ {
+ super(testClass);
+ getArchiveArray(archiveList);
+ }
+
+ public File getArchiveFile(String archive)
+ {
+ return delegate.getTestArchiveFile(archive);
+ }
+
+ public URL getArchiveURL(String archive) throws MalformedURLException
+ {
+ return delegate.getTestArchiveFile(archive).toURI().toURL();
+ }
+
+ public boolean isTargetJBoss500()
+ {
+ return delegate.isTargetJBoss500();
+ }
+
+ public boolean isTargetJBoss423()
+ {
+ return delegate.isTargetJBoss423();
+ }
+
+ public boolean isTargetJBoss422()
+ {
+ return delegate.isTargetJBoss422();
+ }
+
+ public MBeanServerConnection getServer()
+ {
+ return delegate.getServer();
+ }
+
+ private void getArchiveArray(String archiveList)
+ {
+ if (archiveList != null)
+ {
+ StringTokenizer st = new StringTokenizer(archiveList, ", ");
+ archives = new String[st.countTokens()];
+
+ for (int i = 0; i < archives.length; i++)
+ archives[i] = st.nextToken();
+ }
+ }
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ List<URL> clientJars = new ArrayList<URL>();
+ for (int i = 0; i < archives.length; i++)
+ {
+ String archive = archives[i];
+ try
+ {
+ delegate.deploy(archive);
+ }
+ catch (Exception ex)
+ {
+ ex.printStackTrace();
+ delegate.undeploy(archive);
+ }
+
+ if (archive.endsWith("-client.jar"))
+ {
+ URL archiveURL = getArchiveURL(archive);
+ clientJars.add(archiveURL);
+ }
+ }
+
+ ClassLoader parent = Thread.currentThread().getContextClassLoader();
+ originalClassLoader = parent;
+
+ // add client jars to the class loader
+ if (!clientJars.isEmpty())
+ {
+ URL[] urls = new URL[clientJars.size()];
+ for (int i = 0; i < clientJars.size(); i++)
+ {
+ urls[i] = clientJars.get(i);
+ }
+ URLClassLoader cl = new URLClassLoader(urls, parent);
+ Thread.currentThread().setContextClassLoader(cl);
+ }
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ try
+ {
+ for (int i = 0; i < archives.length; i++)
+ {
+ String archive = archives[archives.length - i - 1];
+ delegate.undeploy(archive);
+ }
+ }
+ finally
+ {
+ Thread.currentThread().setContextClassLoader(originalClassLoader);
+ }
+ super.tearDown();
+ }
+}
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/IntegrationTestSetup.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/JBossArchiveDeployer.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/JBossArchiveDeployer.java (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/JBossArchiveDeployer.java 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi.test;
+
+import java.net.URL;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+
+/**
+ * An archive deployer that deals with test deployment/undeployment, etc.
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 14-Oct-2004
+ */
+public class JBossArchiveDeployer implements ArchiveDeployer
+{
+ private static final String MAIN_DEPLOYER = "jboss.system:service=MainDeployer";
+
+ private MBeanServerConnection server;
+
+ public JBossArchiveDeployer(MBeanServerConnection server)
+ {
+ this.server = server;
+ }
+
+ public void deploy(URL url) throws Exception
+ {
+ invokeMainDeployer("deploy", url);
+ }
+
+ public void undeploy(URL url) throws Exception
+ {
+ invokeMainDeployer("undeploy", url);
+ }
+
+ private void invokeMainDeployer(String methodName, URL url) throws Exception
+ {
+ server.invoke(new ObjectName(MAIN_DEPLOYER), methodName, new Object[] { url }, new String[] { "java.net.URL" });
+ }
+}
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/JBossArchiveDeployer.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/OSGiTestCase.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/OSGiTestCase.java (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/OSGiTestCase.java 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,91 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi.test;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import junit.framework.TestCase;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * An OSGi Test Case
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 25-Sep-2008
+ */
+public class OSGiTestCase extends TestCase
+{
+ // Provide logging
+ final Logger log = LoggerFactory.getLogger(OSGiTestCase.class);
+
+ private OSGiTestHelper delegate = new OSGiTestHelper();
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ log.debug("### START " + getLongName());
+ super.setUp();
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ log.debug("### END " + getLongName());
+ }
+
+ protected String getShortName()
+ {
+ String shortName = getClass().getName();
+ shortName = shortName.substring(shortName.lastIndexOf(".") + 1);
+ return shortName;
+ }
+
+ protected String getLongName()
+ {
+ return getClass().getName() + "." + getName();
+ }
+
+ protected URL getResourceURL(String resource)
+ {
+ return delegate.getResourceURL(resource);
+ }
+
+ protected File getResourceFile(String resource)
+ {
+ return delegate.getResourceFile(resource);
+ }
+
+ public File getTestArchiveFile(String archive)
+ {
+ return delegate.getTestArchiveFile(archive);
+ }
+
+ public URL getTestArchiveURL(String archive) throws MalformedURLException
+ {
+ return delegate.getTestArchiveFile(archive).toURI().toURL();
+ }
+}
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/OSGiTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/OSGiTestHelper.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/OSGiTestHelper.java (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/OSGiTestHelper.java 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,108 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi.test;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+/**
+ * An OSGi Test Helper
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 25-Sep-2008
+ */
+public class OSGiTestHelper
+{
+ private static final String SYSPROP_TEST_RESOURCES_DIRECTORY = "test.resources.directory";
+ private static final String SYSPROP_TEST_ARCHIVE_DIRECTORY = "test.archive.directory";
+
+ private static String testResourcesDir;
+ private static String testArchiveDir;
+
+ /** Try to discover the URL for the test resource */
+ public URL getResourceURL(String resource)
+ {
+ URL resURL = null;
+ try
+ {
+ File resourceFile = getResourceFile(resource);
+ resURL = resourceFile.toURI().toURL();
+ }
+ catch (MalformedURLException e)
+ {
+ // ignore
+ }
+ return resURL;
+ }
+
+ /** Try to discover the File for the test resource */
+ public File getResourceFile(String resource)
+ {
+ File file = new File(resource);
+ if (file.exists())
+ return file;
+
+ file = new File(getTestResourcesDir() + "/" + resource);
+ if (file.exists())
+ return file;
+
+ throw new IllegalArgumentException("Cannot obtain '" + getTestResourcesDir() + "/" + resource + "'");
+ }
+
+ public String getTestResourcesDir()
+ {
+ if (testResourcesDir == null)
+ testResourcesDir = System.getProperty(SYSPROP_TEST_RESOURCES_DIRECTORY, "target/test-classes");
+
+ return testResourcesDir;
+ }
+
+ /** Try to discover the URL for the deployment archive */
+ public URL getTestArchiveURL(String archive) throws MalformedURLException
+ {
+ return getTestArchiveFile(archive).toURI().toURL();
+ }
+
+ /** Try to discover the File for the deployment archive */
+ public File getTestArchiveFile(String archive)
+ {
+ File file = new File(archive);
+ if (file.exists())
+ return file;
+
+ file = new File(getTestArchiveDir() + "/" + archive);
+ if (file.exists())
+ return file;
+
+ String notSet = (getTestArchiveDir() == null ? " System property '" + SYSPROP_TEST_ARCHIVE_DIRECTORY + "' not set." : "");
+ throw new IllegalArgumentException("Cannot obtain '" + getTestArchiveDir() + "/" + archive + "'." + notSet);
+ }
+
+ public String getTestArchiveDir()
+ {
+ if (testArchiveDir == null)
+ testArchiveDir = System.getProperty(SYSPROP_TEST_ARCHIVE_DIRECTORY, "target/test-libs");
+
+ return testArchiveDir;
+ }
+}
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/OSGiTestHelper.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/OSGiTestSetup.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/OSGiTestSetup.java (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/OSGiTestSetup.java 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,85 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi.test;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import junit.extensions.TestSetup;
+import junit.framework.TestSuite;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * An OSGi Test Setup
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 25-Sep-2008
+ */
+public class OSGiTestSetup extends TestSetup
+{
+ // Provide logging
+ final Logger log = LoggerFactory.getLogger(OSGiTestSetup.class);
+
+ private OSGiTestHelper delegate = new OSGiTestHelper();
+
+ public OSGiTestSetup(Class<?> testCase)
+ {
+ super(new TestSuite(testCase));
+ }
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ log.debug("### START SETUP " + getTest());
+ super.setUp();
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ log.debug("### END SETUP " + getTest());
+ }
+
+ protected URL getResourceURL(String resource)
+ {
+ return delegate.getResourceURL(resource);
+ }
+
+ protected File getResourceFile(String resource)
+ {
+ return delegate.getResourceFile(resource);
+ }
+
+ public File getTestArchiveFile(String archive)
+ {
+ return delegate.getTestArchiveFile(archive);
+ }
+
+ public URL getTestArchiveURL(String archive) throws MalformedURLException
+ {
+ return delegate.getTestArchiveFile(archive).toURI().toURL();
+ }
+}
Property changes on: projects/jboss-osgi/branches/tdiesler/modules/spi/src/main/java/org/jboss/osgi/spi/test/OSGiTestSetup.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/pom.xml (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/pom.xml 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+
+ <name>JBoss OSGi - Integration</name>
+ <description>JBoss OSGi - Integration</description>
+
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-integration</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>4</version>
+ </parent>
+
+ <!-- Modules -->
+ <modules>
+ <module>modules/spi</module>
+ <module>modules/felix</module>
+ <module>modules/service</module>
+ </modules>
+
+ <!-- Properties -->
+ <properties>
+ <felix.framework.version>1.4.1</felix.framework.version>
+ <felix.javax.servlet.version>1.0.0</felix.javax.servlet.version>
+ <felix.osgi.core.version>1.2.0</felix.osgi.core.version>
+ <felix.webconsole.version>1.2.2</felix.webconsole.version>
+ <jboss.metadata.version>1.0.0.CR11</jboss.metadata.version>
+ <jboss.microcontainer.version>2.0.2.GA</jboss.microcontainer.version>
+ <jboss.deployers.version>2.0.3.GA</jboss.deployers.version>
+ <junit.version>3.8.1</junit.version>
+ <log4j.version>1.2.14</log4j.version>
+ <slf4j.version>1.5.2</slf4j.version>
+ </properties>
+
+ <!-- Dependecy Management -->
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client</artifactId>
+ <version>${jboss.deployers.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client-spi</artifactId>
+ <version>${jboss.deployers.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-structure-spi</artifactId>
+ <version>${jboss.deployers.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata</artifactId>
+ <version>${jboss.metadata.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <version>${jboss.microcontainer.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ <!-- Felix Dependencies -->
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>javax.servlet</artifactId>
+ <version>${felix.javax.servlet.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${felix.osgi.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>${felix.framework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.webconsole</artifactId>
+ <version>${felix.webconsole.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <!-- Build -->
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <failIfNoTests>false</failIfNoTests>
+ <trimStackTrace>false</trimStackTrace>
+ <systemProperties>
+ <property>
+ <name>log4j.output.dir</name>
+ <value>${project.build.directory}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- Repositories -->
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.org/maven2</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshots Repository</name>
+ <layout>default</layout>
+ <url>http://snapshots.jboss.org/maven2</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>repository.codehaus.org</id>
+ <name>Codehaus Repository</name>
+ <layout>default</layout>
+ <url>http://repository.codehaus.org</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <!-- Profiles -->
+ <profiles>
+
+ <!--
+ Name: distro
+ Desc: Build the distribution
+ -->
+ <profile>
+ <id>distro</id>
+ <modules>
+ <module>modules/distribution</module>
+ </modules>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <quiet>true</quiet>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+</project>
Property changes on: projects/jboss-osgi/branches/tdiesler/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/branches/tdiesler/profiles.xml.example
===================================================================
--- projects/jboss-osgi/branches/tdiesler/profiles.xml.example (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/profiles.xml.example 2009-01-29 06:03:06 UTC (rev 83591)
@@ -0,0 +1,46 @@
+<profilesXml 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/xsd/profiles-1.0.0.xsd">
+ <profiles>
+
+ <!-- This profile can also be defined in ~/.m2/settings.xml -->
+ <profile>
+ <id>jboss-home-profile</id>
+ <activation>
+ <property>
+ <name>user.name</name>
+ </property>
+ </activation>
+ <properties>
+ <jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home>
+ <jboss423.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home>
+ <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home>
+
+ <!--
+ <jdbc.mysql.server>localhost</jdbc.mysql.server>
+ <jdbc.mysql.port>3306</jdbc.mysql.port>
+ <jdbc.mysql.database>jbpmtest</jdbc.mysql.database>
+ <jdbc.mysql.url>jdbc:mysql://${jdbc.mysql.server}:${jdbc.mysql.port}/${jdbc.mysql.database}</jdbc.mysql.url>
+ <jdbc.mysql.username>jbpmtest</jdbc.mysql.username>
+ <jdbc.mysql.password></jdbc.mysql.password>
+
+ <jdbc.postgresql.server>localhost</jdbc.postgresql.server>
+ <jdbc.postgresql.port>5432</jdbc.postgresql.port>
+ <jdbc.postgresql.database>jbpmtest</jdbc.postgresql.database>
+ <jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url>
+ <jdbc.postgresql.username>jbpmtest</jdbc.postgresql.username>
+ <jdbc.postgresql.password></jdbc.postgresql.password>
+
+ <jdbc.sybase.server>localhost</jdbc.sybase.server>
+ <jdbc.sybase.port>5000</jdbc.sybase.port>
+ <jdbc.sybase.database>jbpmtest</jdbc.sybase.database>
+ <jdbc.sybase.url>jdbc:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}</jdbc.sybase.url>
+ <jdbc.sybase.username>jbpmtest</jdbc.sybase.username>
+ <jdbc.sybase.password>jbpmtest</jdbc.sybase.password>
+ <jdbc.sybase.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.sybase.driver>
+ <jdbc.sybase.datasource>com.sybase.jdbc3.jdbc.SybXADataSource</jdbc.sybase.datasource>
+ -->
+ </properties>
+ </profile>
+
+ </profiles>
+</profilesXml>
More information about the jboss-cvs-commits
mailing list