Skip to content

Commit 1ce2c8a

Browse files
author
Reza Rahman
committed
Porting to GlassFish
1 parent fa1c800 commit 1ce2c8a

8 files changed

Lines changed: 27 additions & 46 deletions

File tree

‎actionbazaar/src/main/java/com/actionbazaar/interfaces/web/AddBid.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,11 @@
4444
import java.io.Serializable;
4545
import javax.enterprise.context.SessionScoped;
4646
import javax.enterprise.inject.Produces;
47-
import javax.faces.view.ViewScoped;
4847
import javax.inject.Inject;
4948
import javax.inject.Named;
5049

5150
@Named
52-
@ViewScoped
51+
@SessionScoped
5352
public class AddBid implements Serializable {
5453

5554
private static final long serialVersionUID = 1L;
@@ -63,7 +62,6 @@ public class AddBid implements Serializable {
6362
private final Bid bid = new Bid();
6463

6564
public String onAdd() {
66-
System.err.println(bid);
6765
bidService.addBid(bid);
6866

6967
return "confirm_add_bid.jsf";

‎actionbazaar/src/main/resources/META-INF/persistence.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
3-
<persistence-unit name="action-bazaar-unit" transaction-type="JTA">
4-
<jta-data-source>java:global/jdbc/ActionBazaarDB</jta-data-source>
5-
<properties>
6-
<property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
7-
<property name="eclipselink.logging.level" value="INFO"/>
8-
</properties>
9-
</persistence-unit>
3+
<persistence-unit name="action-bazaar-unit" transaction-type="JTA">
4+
<jta-data-source>java:global/jdbc/ActionBazaarDB</jta-data-source>
5+
<properties>
6+
<property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
7+
<property name="eclipselink.logging.level" value="INFO"/>
8+
</properties>
9+
</persistence-unit>
1010
</persistence>

‎actionbazaar/src/main/webapp/WEB-INF/beans.xml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<beans
3-
version="1.0"
4-
xmlns="http://java.sun.com/xml/ns/javaee"
5-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
6-
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
2+
<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_2.xsd"
5+
version="1.2" bean-discovery-mode="all">
76
</beans>

‎actionbazaar/src/main/webapp/WEB-INF/web.xml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<web-app
3-
version="3.0"
4-
xmlns="http://java.sun.com/xml/ns/javaee"
5-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
6-
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
2+
<web-app version="3.1"
3+
xmlns="http://xmlns.jcp.org/xml/ns/javaee"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
76
<context-param>
87
<param-name>javax.faces.PROJECT_STAGE</param-name>
98
<param-value>Development</param-value>
@@ -27,5 +26,5 @@
2726
<name>java:global/jdbc/ActionBazaarDB</name>
2827
<class-name>org.apache.derby.jdbc.EmbeddedDriver</class-name>
2928
<url>jdbc:derby:/tmp/actionbazaar-database;create=true</url>
30-
</data-source>
29+
</data-source>
3130
</web-app>

‎actionbazaar/src/main/webapp/WEB-INF/weblogic.xml‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎actionbazaar/src/test/java/com/actionbazaar/application/BidServiceUnitTest.java‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,23 +39,19 @@
3939
*/
4040
package com.actionbazaar.application;
4141

42-
import static org.junit.Assert.assertEquals;
43-
import static org.junit.Assert.assertNotNull;
44-
42+
import com.actionbazaar.domain.Bid;
43+
import com.actionbazaar.domain.BidRepository;
44+
import com.actionbazaar.infrastructure.database.MockBidRepository;
4545
import javax.ejb.EJB;
46-
4746
import org.jboss.arquillian.container.test.api.Deployment;
4847
import org.jboss.arquillian.junit.Arquillian;
4948
import org.jboss.shrinkwrap.api.ShrinkWrap;
50-
import org.jboss.shrinkwrap.api.asset.EmptyAsset;
5149
import org.jboss.shrinkwrap.api.spec.WebArchive;
50+
import static org.junit.Assert.assertEquals;
51+
import static org.junit.Assert.assertNotNull;
5252
import org.junit.Test;
5353
import org.junit.runner.RunWith;
5454

55-
import com.actionbazaar.domain.Bid;
56-
import com.actionbazaar.domain.BidRepository;
57-
import com.actionbazaar.infrastructure.database.MockBidRepository;
58-
5955
@RunWith(Arquillian.class)
6056
public class BidServiceUnitTest {
6157

‎actionbazaar/src/test/java/com/actionbazaar/interfaces/web/AddBidTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
import org.jboss.arquillian.test.api.ArquillianResource;
5252
import org.jboss.shrinkwrap.api.Archive;
5353
import org.jboss.shrinkwrap.api.ShrinkWrap;
54-
import org.jboss.shrinkwrap.api.asset.EmptyAsset;
5554
import org.jboss.shrinkwrap.api.spec.WebArchive;
5655
import static org.junit.Assert.assertEquals;
5756
import org.junit.Test;
@@ -78,7 +77,7 @@ public static Archive<?> createDeployment() {
7877
.addAsWebInfResource("test-web.xml", "web.xml")
7978
.addAsWebResource("add_bid.xhtml", "add_bid.xhtml")
8079
.addAsWebResource("confirm_add_bid.xhtml", "confirm_add_bid.xhtml")
81-
.addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
80+
.addAsWebInfResource("test-beans.xml", "beans.xml")
8281
.addAsResource("test-persistence.xml",
8382
"META-INF/persistence.xml");
8483
}

‎actionbazaar/src/test/resources/test-web.xml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<web-app
3-
version="3.0"
4-
xmlns="http://java.sun.com/xml/ns/javaee"
5-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
6-
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
2+
<web-app version="3.1"
3+
xmlns="http://xmlns.jcp.org/xml/ns/javaee"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
76
<context-param>
87
<param-name>javax.faces.PROJECT_STAGE</param-name>
98
<param-value>UnitTest</param-value>

0 commit comments

Comments
 (0)