Skip to content

Commit

Permalink
Remove WebAppSupport
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas Diesler committed Jul 13, 2012
1 parent 1ebb78d commit 3c1ce04
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 72 deletions.
10 changes: 5 additions & 5 deletions eclipse/jbosgi-formatter.xml
View file
Expand Up @@ -51,7 +51,7 @@
<setting id="org.eclipse.jdt.core.compiler.source" value="1.7"/> <setting id="org.eclipse.jdt.core.compiler.source" value="1.7"/>
<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_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_opening_paren_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/> <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="false"/>
<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.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
<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_after_comma_in_enum_declarations" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/> <setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
Expand Down Expand Up @@ -120,7 +120,7 @@
<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_after_question_in_wildcard" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" 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_closing_bracket_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="true"/> <setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
<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_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.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.compiler.problem.enumIdentifier" value="error"/>
Expand Down Expand Up @@ -204,7 +204,7 @@
<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_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="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/> <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="true"/> <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.comment.line_length" value="168"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
Expand All @@ -221,7 +221,7 @@
<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.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.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.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="false"/> <setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
<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_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.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.alignment_for_compact_if" value="16"/>
Expand Down Expand Up @@ -253,7 +253,7 @@
<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/> <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/> <setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/> <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.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.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.insert_new_line_in_empty_block" value="insert"/>
Expand Down
14 changes: 7 additions & 7 deletions pom.xml
View file
Expand Up @@ -15,7 +15,7 @@
<parent> <parent>
<groupId>org.jboss.osgi</groupId> <groupId>org.jboss.osgi</groupId>
<artifactId>jbosgi-parent</artifactId> <artifactId>jbosgi-parent</artifactId>
<version>1.0.22</version> <version>1.0.23</version>
</parent> </parent>


<name>JBossOSGi</name> <name>JBossOSGi</name>
Expand Down Expand Up @@ -59,19 +59,19 @@
<version.jboss.osgi.deployment>1.1.1.Final</version.jboss.osgi.deployment> <version.jboss.osgi.deployment>1.1.1.Final</version.jboss.osgi.deployment>
<version.jboss.osgi.equinox>3.5.2.SP1</version.jboss.osgi.equinox> <version.jboss.osgi.equinox>3.5.2.SP1</version.jboss.osgi.equinox>
<version.jboss.osgi.felix>3.0.4</version.jboss.osgi.felix> <version.jboss.osgi.felix>3.0.4</version.jboss.osgi.felix>
<version.jboss.osgi.framework>2.0.0.CR2</version.jboss.osgi.framework> <version.jboss.osgi.framework>2.0.0.CR6-SNAPSHOT</version.jboss.osgi.framework>
<version.jboss.osgi.jmx>1.1.0.Final</version.jboss.osgi.jmx> <version.jboss.osgi.jmx>1.1.0.Final</version.jboss.osgi.jmx>
<version.jboss.osgi.logging>1.0.0</version.jboss.osgi.logging> <version.jboss.osgi.logging>1.0.0</version.jboss.osgi.logging>
<version.jboss.osgi.metadata>2.1.1.CR3</version.jboss.osgi.metadata> <version.jboss.osgi.metadata>2.1.1.CR7</version.jboss.osgi.metadata>
<version.jboss.osgi.repository>2.0.0.CR1</version.jboss.osgi.repository> <version.jboss.osgi.repository>2.0.0.CR3</version.jboss.osgi.repository>
<version.jboss.osgi.resolver>3.0.0.CR3</version.jboss.osgi.resolver> <version.jboss.osgi.resolver>3.0.0.CR8-SNAPSHOT</version.jboss.osgi.resolver>
<version.jboss.osgi.spi>3.1.1.CR4</version.jboss.osgi.spi> <version.jboss.osgi.spi>3.1.1.CR6-SNAPSHOT</version.jboss.osgi.spi>
<version.jboss.osgi.testing>1.0.4</version.jboss.osgi.testing> <version.jboss.osgi.testing>1.0.4</version.jboss.osgi.testing>
<version.jboss.osgi.vfs>1.1.2.CR1</version.jboss.osgi.vfs> <version.jboss.osgi.vfs>1.1.2.CR1</version.jboss.osgi.vfs>
<version.jboss.osgi.xerces>3.1.0.Final</version.jboss.osgi.xerces> <version.jboss.osgi.xerces>3.1.0.Final</version.jboss.osgi.xerces>
<version.jboss.spec.annotations11.api>1.0.1.Final</version.jboss.spec.annotations11.api> <version.jboss.spec.annotations11.api>1.0.1.Final</version.jboss.spec.annotations11.api>
<version.jboss.spec.ejb3.api>1.0.1.Final</version.jboss.spec.ejb3.api> <version.jboss.spec.ejb3.api>1.0.1.Final</version.jboss.spec.ejb3.api>
<version.jboss.spec.servlet30.api>1.0.2.Final-SNAPSHOT</version.jboss.spec.servlet30.api> <version.jboss.spec.servlet30.api>1.0.2.Final</version.jboss.spec.servlet30.api>
<version.jboss.spec.transaction11.api>1.0.1.Final</version.jboss.spec.transaction11.api> <version.jboss.spec.transaction11.api>1.0.1.Final</version.jboss.spec.transaction11.api>
<version.junit>4.10</version.junit> <version.junit>4.10</version.junit>
<version.ops4j.paxlogging>1.6.4</version.ops4j.paxlogging> <version.ops4j.paxlogging>1.6.4</version.ops4j.paxlogging>
Expand Down
42 changes: 0 additions & 42 deletions testsuite/example/src/main/java/org/jboss/test/osgi/WebAppSupport.java
View file

This file was deleted.

12 changes: 1 addition & 11 deletions ...uite/example/src/test/java/org/jboss/test/osgi/example/jbossas/webapp/WebAppTestCase.java
View file
Expand Up @@ -39,10 +39,8 @@
import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.Asset; import org.jboss.shrinkwrap.api.asset.Asset;
import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.test.osgi.HttpServiceSupport;
import org.jboss.test.osgi.HttpSupport; import org.jboss.test.osgi.HttpSupport;
import org.jboss.test.osgi.RepositorySupport; import org.jboss.test.osgi.RepositorySupport;
import org.jboss.test.osgi.WebAppSupport;
import org.jboss.test.osgi.example.jbossas.webapp.bundle.EndpointServlet; import org.jboss.test.osgi.example.jbossas.webapp.bundle.EndpointServlet;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
Expand Down Expand Up @@ -72,7 +70,7 @@ public class WebAppTestCase {
@Deployment @Deployment
public static WebArchive createdeployment() { public static WebArchive createdeployment() {
final WebArchive archive = ShrinkWrap.create(WebArchive.class, "example-webapp"); final WebArchive archive = ShrinkWrap.create(WebArchive.class, "example-webapp");
archive.addClasses(EndpointServlet.class, RepositorySupport.class, HttpServiceSupport.class, HttpSupport.class, WebAppSupport.class); archive.addClasses(EndpointServlet.class, RepositorySupport.class, HttpSupport.class);
archive.addAsWebResource("webapp/message.txt", "message.txt"); archive.addAsWebResource("webapp/message.txt", "message.txt");
archive.addAsWebInfResource("webapp/web.xml", "web.xml"); archive.addAsWebInfResource("webapp/web.xml", "web.xml");
archive.addAsManifestResource(RepositorySupport.BUNDLE_VERSIONS_FILE); archive.addAsManifestResource(RepositorySupport.BUNDLE_VERSIONS_FILE);
Expand All @@ -94,28 +92,20 @@ public InputStream openStream() {


@Test @Test
public void testServletAccess() throws Exception { public void testServletAccess() throws Exception {

// Provide WebApp support
WebAppSupport.provideWebappSupport(context, bundle);

// Start the test bundle
bundle.start(); bundle.start();

String line = getHttpResponse("/example-webapp/servlet?test=plain", 5000); String line = getHttpResponse("/example-webapp/servlet?test=plain", 5000);
assertEquals("Hello from Servlet", line); assertEquals("Hello from Servlet", line);
} }


@Test @Test
public void testServletInitProps() throws Exception { public void testServletInitProps() throws Exception {
WebAppSupport.provideWebappSupport(context, bundle);
bundle.start(); bundle.start();
String line = getHttpResponse("/example-webapp/servlet?test=initProp", 5000); String line = getHttpResponse("/example-webapp/servlet?test=initProp", 5000);
assertEquals("initProp=SomeValue", line); assertEquals("initProp=SomeValue", line);
} }


@Test @Test
public void testResourceAccess() throws Exception { public void testResourceAccess() throws Exception {
WebAppSupport.provideWebappSupport(context, bundle);
bundle.start(); bundle.start();
String line = getHttpResponse("/example-webapp/message.txt", 5000); String line = getHttpResponse("/example-webapp/message.txt", 5000);
assertEquals("Hello from Resource", line); assertEquals("Hello from Resource", line);
Expand Down
8 changes: 1 addition & 7 deletions testsuite/example/src/test/java/org/jboss/test/osgi/example/simple/SimpleBundleTestCase.java
View file
Expand Up @@ -76,13 +76,7 @@ public void testBundleInjection() throws Exception {
assertEquals("example-bundle", bundle.getSymbolicName()); assertEquals("example-bundle", bundle.getSymbolicName());
assertEquals(Version.emptyVersion, bundle.getVersion()); assertEquals(Version.emptyVersion, bundle.getVersion());


// Assert that the bundle is in state RESOLVED // Assert that the bundle is in state ACTIVE
// Note when the test bundle contains the test case it
// must be resolved already when this test method is called
assertEquals(Bundle.RESOLVED, bundle.getState());

// Start the bundle
bundle.start();
assertEquals(Bundle.ACTIVE, bundle.getState()); assertEquals(Bundle.ACTIVE, bundle.getState());


// Get the service reference // Get the service reference
Expand Down

0 comments on commit 3c1ce04

Please sign in to comment.