Skip to content

Commit 34aa878

Browse files
author
Jared Nagle
committed
moved the util classes into core and created some more test jsf pages
1 parent 52699d3 commit 34aa878

21 files changed

+126
-23
lines changed

‎pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
<groupId>com.thenaglecode</groupId>
88
<artifactId>algorithms</artifactId>
99
<version>1.0.0.Pre-Alpha</version>
10+
<properties>
11+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
12+
</properties>
1013
<dependencies>
1114
<dependency>
1215
<groupId>org.jboss.spec</groupId>

‎src/main/java/com/thenaglecode/algorithms/Configuration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.thenaglecode.algorithms;
22

3-
import com.thenaglecode.algorithms.util.ConfigurationItem;
3+
import com.thenaglecode.core.util.ConfigurationItem;
44

55
/**
66
* Created with IntelliJ IDEA.

‎src/main/java/com/thenaglecode/algorithms/ConfigurationManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.thenaglecode.algorithms;
22

3-
import com.thenaglecode.algorithms.util.propeties.AbstractConfigurationManager;
3+
import com.thenaglecode.core.util.propeties.AbstractConfigurationManager;
44

55
/**
66
* Created with IntelliJ IDEA.

‎src/main/java/com/thenaglecode/algorithms/primes/PrimeGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.thenaglecode.algorithms.Configuration;
44
import com.thenaglecode.algorithms.ConfigurationManager;
5-
import com.thenaglecode.algorithms.util.Named;
5+
import com.thenaglecode.core.util.Named;
66

77
/**
88
* Created with IntelliJ IDEA.

‎src/main/java/com/thenaglecode/core/Configuration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.thenaglecode.core;
22

3-
import com.thenaglecode.algorithms.util.ConfigurationItem;
3+
import com.thenaglecode.core.util.ConfigurationItem;
44

55
/**
66
* Created with IntelliJ IDEA.

‎src/main/java/com/thenaglecode/core/ConfigurationManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.thenaglecode.core;
22

3-
import com.thenaglecode.algorithms.util.propeties.AbstractConfigurationManager;
3+
import com.thenaglecode.core.util.propeties.AbstractConfigurationManager;
44

55
/**
66
* Created with IntelliJ IDEA.

‎src/main/java/com/thenaglecode/core/ui/Configuration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.thenaglecode.core.ui;
22

3-
import com.thenaglecode.algorithms.util.ConfigurationItem;
3+
import com.thenaglecode.core.util.ConfigurationItem;
44

55
/**
66
* Created with IntelliJ IDEA.

‎src/main/java/com/thenaglecode/core/ui/CoreUIConfigurationManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.thenaglecode.core.ui;
22

3-
import com.thenaglecode.algorithms.util.propeties.AbstractConfigurationManager;
3+
import com.thenaglecode.core.util.propeties.AbstractConfigurationManager;
44

55
/**
66
* Created with IntelliJ IDEA.

‎src/main/java/com/thenaglecode/algorithms/util/ConfigurationItem.java renamed to ‎src/main/java/com/thenaglecode/core/util/ConfigurationItem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.thenaglecode.algorithms.util;
1+
package com.thenaglecode.core.util;
22

33
/**
44
* Created with IntelliJ IDEA.

‎src/main/java/com/thenaglecode/algorithms/util/Named.java renamed to ‎src/main/java/com/thenaglecode/core/util/Named.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.thenaglecode.algorithms.util;
1+
package com.thenaglecode.core.util;
22

33
/**
44
* Created with IntelliJ IDEA.

‎src/main/java/com/thenaglecode/algorithms/util/PackageUtil.java renamed to ‎src/main/java/com/thenaglecode/core/util/PackageUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.thenaglecode.algorithms.util;
1+
package com.thenaglecode.core.util;
22

33
import com.thenaglecode.algorithms.Configuration;
44
import com.thenaglecode.algorithms.ConfigurationManager;
5-
import com.thenaglecode.algorithms.util.propeties.PropertyBundleResource;
5+
import com.thenaglecode.core.util.propeties.PropertyBundleResource;
66

77
import java.util.ResourceBundle;
88

‎src/main/java/com/thenaglecode/algorithms/util/propeties/AbstractConfigurationManager.java renamed to ‎src/main/java/com/thenaglecode/core/util/propeties/AbstractConfigurationManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.thenaglecode.algorithms.util.propeties;
1+
package com.thenaglecode.core.util.propeties;
22

3-
import com.thenaglecode.algorithms.util.ConfigurationItem;
3+
import com.thenaglecode.core.util.ConfigurationItem;
44

55
import java.util.PropertyResourceBundle;
66

‎src/main/java/com/thenaglecode/algorithms/util/propeties/PropertiesResource.java renamed to ‎src/main/java/com/thenaglecode/core/util/propeties/PropertiesResource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.thenaglecode.algorithms.util.propeties;
1+
package com.thenaglecode.core.util.propeties;
22

33
import javax.enterprise.util.Nonbinding;
44
import javax.xml.ws.BindingType;

‎src/main/java/com/thenaglecode/algorithms/util/propeties/PropertiesResourceBundleLocator.java renamed to ‎src/main/java/com/thenaglecode/core/util/propeties/PropertiesResourceBundleLocator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.thenaglecode.algorithms.util.propeties;
1+
package com.thenaglecode.core.util.propeties;
22

33
import javax.enterprise.inject.Produces;
44
import javax.enterprise.inject.spi.InjectionPoint;

‎src/main/java/com/thenaglecode/algorithms/util/propeties/PropertiesResourceLocator.java renamed to ‎src/main/java/com/thenaglecode/core/util/propeties/PropertiesResourceLocator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.thenaglecode.algorithms.util.propeties;
1+
package com.thenaglecode.core.util.propeties;
22

33
import javax.enterprise.inject.Produces;
44
import javax.enterprise.inject.spi.InjectionPoint;

‎src/main/java/com/thenaglecode/algorithms/util/propeties/PropertyBundleResource.java renamed to ‎src/main/java/com/thenaglecode/core/util/propeties/PropertyBundleResource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.thenaglecode.algorithms.util.propeties;
1+
package com.thenaglecode.core.util.propeties;
22

33
import javax.enterprise.util.Nonbinding;
44
import javax.xml.ws.BindingType;

‎src/main/webapp/common/common.xhtml

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,39 @@
1313
xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets">
1414

1515
<h:head>
16-
<title>Simple JSF Facelets page</title>
16+
<style type="text/css">
17+
.header {
18+
border: aqua thick;
19+
}
20+
21+
.content {
22+
border: aliceblue dotted;
23+
}
24+
25+
.footer {
26+
border: aquamarine outset;
27+
}
28+
</style>
29+
<ui:insert>
30+
<ui:include src="/common/head.xhtml" />
31+
</ui:insert>
1732
</h:head>
1833

1934
<h:body>
20-
<div class="">
21-
<ui:include src="/common/header.xhtml" />
35+
<div class="header">
36+
<ui:insert name="header">
37+
<ui:include src="/common/header.xhtml" />
38+
</ui:insert>
39+
</div>
40+
<div class="content">
41+
<ui:insert name="content">
42+
<ui:include src="/common/content.xhtml" />
43+
</ui:insert>
2244
</div>
2345
<div>
46+
<ui:insert name="footer">
47+
<ui:include src="/common/footer.xhtml" />
48+
</ui:insert>
2449
</div>
2550
</h:body>
2651

‎src/main/webapp/common/content.xhtml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Created by IntelliJ IDEA.
4+
User: Jared Nagle
5+
Date: 4/08/13
6+
Time: 1:25 PM
7+
-->
8+
<!DOCTYPE html
9+
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
10+
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
11+
12+
<html xmlns="http://www.w3.org/1999/xhtml"
13+
xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets">
14+
15+
<h:head>
16+
</h:head>
17+
18+
<h:body>
19+
<ui:composition>
20+
Content goes here.
21+
</ui:composition>
22+
</h:body>
23+
24+
</html>

‎src/main/webapp/common/footer.xhtml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Created by IntelliJ IDEA.
4+
User: Jared Nagle
5+
Date: 4/08/13
6+
Time: 1:25 PM
7+
-->
8+
<!DOCTYPE html
9+
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
10+
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
11+
12+
<html xmlns="http://www.w3.org/1999/xhtml"
13+
xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets">
14+
15+
<h:head>
16+
</h:head>
17+
18+
<h:body>
19+
<ui:composition>
20+
<h1>Footer goes here.</h1>
21+
</ui:composition>
22+
</h:body>
23+
24+
</html>

‎src/main/webapp/common/head.xhtml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Created by IntelliJ IDEA.
4+
User: Jared Nagle
5+
Date: 4/08/13
6+
Time: 1:22 PM
7+
-->
8+
<!DOCTYPE html
9+
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
10+
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
11+
12+
<html xmlns="http://www.w3.org/1999/xhtml"
13+
xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets">
14+
15+
<h:head>
16+
<ui:composition>
17+
<link rel="stylesheet" href="#{constants.BOOTSTRAP_CDN_CSS}"></link>
18+
<script src="#{constants.BOOTSTRAP_CDN_JAVASCRIPT}" language="JavaScript" type="text/javascript"></script>
19+
</ui:composition>
20+
</h:head>
21+
22+
<h:body>
23+
24+
</h:body>
25+
26+
</html>

‎src/main/webapp/common/header.xhtml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313
xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets">
1414

1515
<h:head>
16+
</h:head>
17+
<h:body>
1618
<ui:composition>
17-
<link rel="stylesheet" href="#{constants.BOOTSTRAP_CDN_CSS}"></link>
18-
<script src="#{constants.BOOTSTRAP_CDN_JAVASCRIPT}" language="JavaScript" type="text/javascript"></script>
19+
<h1>This is the Header</h1>
1920
</ui:composition>
20-
</h:head>
21+
</h:body>
2122
</html>

0 commit comments

Comments
 (0)