Skip to content

Commit b839bb6

Browse files
author
=
committed
Setup JBoss application server with a test jsf page.
Also rearranged the folder structure to match the default maven folder structure incase i wanted to switch over to maven at any point
1 parent bb19030 commit b839bb6

25 files changed

+82
-45
lines changed

‎.idea/artifacts/algorithms.xml

+19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/modules.xml

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Algorithms.iml

+18-1
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,32 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<module type="JAVA_MODULE" version="4">
3+
<component name="FacetManager">
4+
<facet type="web" name="webapp">
5+
<configuration>
6+
<descriptors>
7+
<deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
8+
</descriptors>
9+
<webroots>
10+
<root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
11+
</webroots>
12+
</configuration>
13+
<facet type="jsf" name="JSF">
14+
<configuration />
15+
</facet>
16+
</facet>
17+
</component>
318
<component name="NewModuleRootManager" inherit-compiler-output="true">
419
<exclude-output />
520
<content url="file://$MODULE_DIR$">
6-
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
21+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
22+
<sourceFolder url="file://$MODULE_DIR$/src/main/webapp" isTestSource="false" />
723
</content>
824
<orderEntry type="inheritedJdk" />
925
<orderEntry type="sourceFolder" forTests="false" />
1026
<orderEntry type="library" name="commons-lang3-3.1" level="application" />
1127
<orderEntry type="library" name="commons-collections4-4.0-alpha1" level="application" />
1228
<orderEntry type="library" name="joda-time-2.2" level="application" />
29+
<orderEntry type="library" name="jsf-2.0.1-FCS" level="application" />
1330
</component>
1431
</module>
1532

‎src/com/thenaglecode/algorithms/configuration.properties

-3
This file was deleted.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* Time: 4:46 PM
1010
*/
1111
public class Configuration {
12-
public static final ConfigurationItem PRIME_GENERATOR_CLASS = new ConfigurationItem("primes.generator.class", "com.thenaglecode.algorithms.primes.PGSimple1");
12+
public static final ConfigurationItem PRIME_GENERATOR_CLASS = new ConfigurationItem("primes.generator.class", "PGSimple1");
1313
public static final ConfigurationItem PRIME_UPTO = new ConfigurationItem("primes.upto", "1000");
1414
public static final ConfigurationItem FILE_PRIMES = new ConfigurationItem("file.primes", "C;/primes.obj");
1515

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

File renamed without changes.

‎src/com/thenaglecode/algorithms/Main.java renamed to ‎src/main/java/com/thenaglecode/algorithms/Main.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,14 @@ public static void main(String[] args) {
2727
PrimeList pList = generator.generate(max);
2828
try {
2929
File primes = new File(ConfigurationManager.getInstance().getValue(Configuration.FILE_PRIMES));
30-
if(primes.exists()) primes.delete();
30+
if(primes.exists()) //noinspection ResultOfMethodCallIgnored
31+
primes.delete();
3132
FileOutputStream fileOut = new FileOutputStream(ConfigurationManager.getInstance().getValue(Configuration.FILE_PRIMES));
3233
ObjectOutputStream out = new ObjectOutputStream(fileOut);
3334
out.writeObject(pList);
3435
out.close();
3536
fileOut.close();
3637
System.out.println("Saved the primes");
37-
} catch (FileNotFoundException e) {
38-
e.printStackTrace();
3938
} catch (IOException e) {
4039
e.printStackTrace();
4140
}

‎src/main/java/com/thenaglecode/algorithms/configuration.properties

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
primes.generator.class=main.java.com.thenaglecode.algorithms.primes.PG7_8
2+
primes.upto=10000000
3+
file.primes=C:/primes.obj

‎src/com/thenaglecode/algorithms/primes/PG7_8.java renamed to ‎src/main/java/com/thenaglecode/algorithms/primes/PG7_8.java

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package com.thenaglecode.algorithms.primes;
22

3+
import com.thenaglecode.algorithms.primes.PrimeGenerator;
4+
import com.thenaglecode.algorithms.primes.PrimeList;
5+
36
import java.util.ArrayList;
47
import java.util.Collections;
58
import java.util.LinkedList;

‎src/com/thenaglecode/algorithms/primes/PGSimple1.java renamed to ‎src/main/java/com/thenaglecode/algorithms/primes/PGSimple1.java

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package com.thenaglecode.algorithms.primes;
22

3+
import com.thenaglecode.algorithms.primes.PrimeGenerator;
4+
import com.thenaglecode.algorithms.primes.PrimeList;
5+
36
import java.util.ArrayList;
47
import java.util.List;
58

‎src/com/thenaglecode/algorithms/primes/PGSimple2.java renamed to ‎src/main/java/com/thenaglecode/algorithms/primes/PGSimple2.java

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package com.thenaglecode.algorithms.primes;
22

3+
import com.thenaglecode.algorithms.primes.PrimeGenerator;
4+
import com.thenaglecode.algorithms.primes.PrimeList;
5+
36
import java.util.ArrayList;
47
import java.util.List;
58

‎src/com/thenaglecode/algorithms/primes/PGSimple3.java renamed to ‎src/main/java/com/thenaglecode/algorithms/primes/PGSimple3.java

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package com.thenaglecode.algorithms.primes;
22

3+
import com.thenaglecode.algorithms.primes.PrimeGenerator;
4+
import com.thenaglecode.algorithms.primes.PrimeList;
5+
36
import java.util.ArrayList;
47
import java.util.List;
58

‎src/com/thenaglecode/algorithms/primes/PGSimple4.java renamed to ‎src/main/java/com/thenaglecode/algorithms/primes/PGSimple4.java

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package com.thenaglecode.algorithms.primes;
22

3+
import com.thenaglecode.algorithms.primes.PrimeGenerator;
4+
import com.thenaglecode.algorithms.primes.PrimeList;
5+
36
import java.util.ArrayList;
47
import java.util.Collections;
58
import java.util.LinkedList;

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

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
* User: jxnagl
1010
* Date: 7/25/13
1111
* Time: 3:59 PM
12-
* To change this template use File | Settings | File Templates.
1312
*/
1413
public abstract class PrimeGenerator implements Named {
1514
private static PrimeGenerator instance;

‎src/com/thenaglecode/algorithms/primes/PrimeList.java renamed to ‎src/main/java/com/thenaglecode/algorithms/primes/PrimeList.java

File renamed without changes.

‎src/com/thenaglecode/algorithms/random/LinearCongruentialGenerator.java renamed to ‎src/main/java/com/thenaglecode/algorithms/random/LinearCongruentialGenerator.java

File renamed without changes.

‎src/com/thenaglecode/algorithms/random/RandomNumberGenerator.java renamed to ‎src/main/java/com/thenaglecode/algorithms/random/RandomNumberGenerator.java

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

‎web/web/WEB-INF/web.xml renamed to ‎src/main/webapp/WEB-INF/web.xml

File renamed without changes.

‎src/main/webapp/index.xhtml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Created by IntelliJ IDEA.
4+
User: jxnagl
5+
Date: 7/30/13
6+
Time: 5:48 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">
14+
15+
<h:head>
16+
<title>Simple JSF Facelets page</title>
17+
</h:head>
18+
19+
<h:body>
20+
Place your content here
21+
</h:body>
22+
23+
</html>

‎web/web.iml

-24
This file was deleted.

‎web/web/index.jsp

-10
This file was deleted.

0 commit comments

Comments
 (0)