Skip to content

Commit f7019ed

Browse files
author
Jared Nagle
committed
testing out some bootstrap api stuff.
1 parent 34aa878 commit f7019ed

28 files changed

+359
-134
lines changed

‎.idea/artifacts/algorithms.xml

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

‎.idea/artifacts/algorithms_war_exploded.xml

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

‎.idea/compiler.xml

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

‎.idea/encodings.xml

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

‎.idea/jenkinsSettings.xml

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

‎.idea/libraries/Maven__joda_time_joda_time_2_2.xml

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

‎.idea/runConfigurations/Jboss.xml

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

‎Algorithms.iml

+8-5
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
<webroots>
1010
<root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
1111
</webroots>
12+
<sourceRoots>
13+
<root url="file://$MODULE_DIR$/src/main/webapp" />
14+
<root url="file://$MODULE_DIR$/src/main/java" />
15+
</sourceRoots>
1216
</configuration>
1317
<facet type="jsf" name="JSF">
1418
<configuration />
@@ -17,27 +21,25 @@
1721
<facet type="ejb" name="EJB">
1822
<configuration>
1923
<ejbRoots>
20-
<root url="file://$MODULE_DIR$/src/main/java" />
2124
<root url="file://$MODULE_DIR$/src/main/webapp" />
25+
<root url="file://$MODULE_DIR$/src/main/java" />
2226
</ejbRoots>
2327
</configuration>
2428
</facet>
2529
</component>
26-
<component name="NewModuleRootManager" inherit-compiler-output="false">
30+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
2731
<output url="file://$MODULE_DIR$/target/classes" />
2832
<output-test url="file://$MODULE_DIR$/target/test-classes" />
29-
<exclude-output />
3033
<content url="file://$MODULE_DIR$">
3134
<sourceFolder url="file://$MODULE_DIR$/src/main/webapp" isTestSource="false" />
3235
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
36+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
3337
<excludeFolder url="file://$MODULE_DIR$/target" />
3438
</content>
3539
<orderEntry type="inheritedJdk" />
3640
<orderEntry type="sourceFolder" forTests="false" />
3741
<orderEntry type="library" name="commons-lang3-3.1" level="application" />
3842
<orderEntry type="library" name="commons-collections4-4.0-alpha1" level="application" />
39-
<orderEntry type="library" name="joda-time-2.2" level="application" />
40-
<orderEntry type="library" name="jsf-2.0.1-FCS" level="application" />
4143
<orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.spec:jboss-javaee-all-6.0:3.0.2.Final" level="project" />
4244
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.activation:activation:1.1.1" level="project" />
4345
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.enterprise:cdi-api:1.0-SP4" level="project" />
@@ -72,6 +74,7 @@
7274
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.1" level="project" />
7375
<orderEntry type="library" name="Maven: xalan:serializer:2.7.1" level="project" />
7476
<orderEntry type="library" name="Maven: xml-apis:xml-apis:1.3.04" level="project" />
77+
<orderEntry type="library" name="Maven: joda-time:joda-time:2.2" level="project" />
7578
</component>
7679
</module>
7780

‎pom.xml

+37
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,42 @@
3333
<artifactId>xalan</artifactId>
3434
<version>2.7.1</version>
3535
</dependency>
36+
<dependency>
37+
<groupId>joda-time</groupId>
38+
<artifactId>joda-time</artifactId>
39+
<version>2.2</version>
40+
</dependency>
3641
</dependencies>
42+
43+
<build>
44+
<pluginManagement>
45+
<plugins>
46+
<plugin>
47+
<groupId>org.jboss.as.plugins</groupId>
48+
<artifactId>jboss-as-maven-plugin</artifactId>
49+
<version>7.4.Final</version>
50+
</plugin>
51+
</plugins>
52+
</pluginManagement>
53+
<plugins>
54+
<plugin>
55+
<groupId>org.apache.maven.plugins</groupId>
56+
<artifactId>maven-compiler-plugin</artifactId>
57+
<version>3.1</version>
58+
<configuration>
59+
<source>1.7</source>
60+
<target>1.7</target>
61+
</configuration>
62+
</plugin>
63+
<plugin>
64+
<groupId>org.jboss.as.plugins</groupId>
65+
<artifactId>jboss-as-maven-plugin</artifactId>
66+
<configuration>
67+
<javaHome>C:\Program Files\Java\jdk1.7.0_25</javaHome>
68+
<execute-commands></execute-commands>
69+
<executeCommands></executeCommands>
70+
</configuration>
71+
</plugin>
72+
</plugins>
73+
</build>
3774
</project>

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

+2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
public class Configuration {
1212
public static final String BOOTSTRAP_API_CDN_CSS_ID = "bootstrap.cdn.css";
1313
public static final String BOOTSTRAP_API_CDN_JAVASCRIPT_ID = "bootstrap.cdn.javascript";
14+
public static final String JQUERY_VERSION_ID = "jquery.version";
1415

1516
public static final ConfigurationItem BOOTSTRAP_API_CDN_CSS = new ConfigurationItem(BOOTSTRAP_API_CDN_CSS_ID, "//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc1/css/bootstrap.min.css");
1617
public static final ConfigurationItem BOOTSTRAP_API_CDN_JAVASCRIPT = new ConfigurationItem(BOOTSTRAP_API_CDN_JAVASCRIPT_ID, "//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc1/js/bootstrap.min.js");
18+
public static final ConfigurationItem JQUERY_VERSION = new ConfigurationItem(JQUERY_VERSION_ID, "2.0.3");
1719
}

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

+4-5
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.thenaglecode.core.util.ConfigurationItem;
44

55
import java.util.PropertyResourceBundle;
6+
import java.util.ResourceBundle;
67

78
/**
89
* Created with IntelliJ IDEA.
@@ -17,13 +18,10 @@
1718
*/
1819
public abstract class AbstractConfigurationManager {
1920

20-
private AbstractConfigurationManager instance;
21-
PropertyResourceBundle bundle;
21+
ResourceBundle bundle;
2222
private String propertyFile;
2323
private static final String DEFAULT_CONFIG_BUDNLE_NAME = "configuration";
2424

25-
public abstract <T extends AbstractConfigurationManager> T getInstance();
26-
2725
/**
2826
* do not ctor
2927
*/
@@ -63,6 +61,7 @@ protected void init(){
6361
protected void init(String propertyFile) {
6462
setPropertyFile(propertyFile);
6563
String baseName = getClass().getPackage().getName() + "." + propertyFile;
66-
bundle = (PropertyResourceBundle) PropertyResourceBundle.getBundle(baseName);
64+
65+
bundle = PropertyResourceBundle.getBundle(baseName);
6766
}
6867
}

‎src/main/java/com/thenaglecode/jsf/Constants.java

+4
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,8 @@ public String getBOOTSTRAP_CDN_CSS(){
2626
public String getBOOTSTRAP_CDN_JAVASCRIPT(){
2727
return uiManager.getValue(Configuration.BOOTSTRAP_API_CDN_JAVASCRIPT);
2828
}
29+
30+
public String getJQUERY_VERSION(){
31+
return uiManager.getValue(Configuration.JQUERY_VERSION);
32+
}
2933
}

‎src/main/java/com/thenaglecode/jsf/NavigationController.java

+4
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,8 @@ public String moveToPage1(){
1717
public String moveToRandomGeneratorPage(){
1818
return "random";
1919
}
20+
21+
public String moveToHome(){
22+
return "home";
23+
}
2024
}

‎src/main/java/com/thenaglecode/jsf/URLController.java

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package com.thenaglecode.jsf;
2+
3+
/**
4+
* Created with IntelliJ IDEA.
5+
* User: Jared Nagle
6+
* Date: 4/08/13
7+
* Time: 3:51 PM
8+
* To change this template use File | Settings | File Templates.
9+
*/
10+
public class URLController {
11+
}

‎src/main/java/com/thenaglecode/algorithms/configuration.properties renamed to ‎src/main/resources/com/thenaglecode/algorithms/configuration.properties

File renamed without changes.

‎src/main/java/com/thenaglecode/core/configuration.properties renamed to ‎src/main/resources/com/thenaglecode/core/configuration.properties

File renamed without changes.

‎src/main/java/com/thenaglecode/core/ui/coreUI.properties renamed to ‎src/main/resources/com/thenaglecode/core/ui/coreUI.properties

+9-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,12 @@
66
bootstrap.cdn.css=//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc1/css/bootstrap.min.css
77

88
# bootstrap javascript
9-
bootstrap.cdn.javascript=//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc1/js/bootstrap.min.js
9+
bootstrap.cdn.javascript=//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc1/js/bootstrap.min.js
10+
11+
12+
# ----------------------------------------------------------------------------
13+
# JQUERY API VARIABLES |
14+
# ----------------------------------------------------------------------------
15+
16+
#change this to a version that is located in the webapp/resources/js/ folder.
17+
jquery.version=2.0.3

0 commit comments

Comments
 (0)