Skip to content

Commit b90a436

Browse files
carlosvasquezcarlosvasquez
committed
merge de cambios
1 parent 5da44b0 commit b90a436

34 files changed

+1523
-264
lines changed

‎faces-config.NavData‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scene Scope="Project" version="2">
33
<Scope Scope="Faces Configuration Only"/>
4-
<Scope Scope="Project">
5-
<Node id="index.html" x="650" y="150" zoom="true"/>
6-
<Node id="index.jsp" x="400" y="150" zoom="true"/>
7-
<Node id="test.jsp" x="400" y="300" zoom="true"/>
8-
<Node id="explorer.html" x="150" y="300" zoom="true"/>
9-
<Node id="newjsf.xhtml" x="150" y="150" zoom="true"/>
10-
</Scope>
4+
<Scope Scope="Project"/>
115
<Scope Scope="All Faces Configurations"/>
126
</Scene>

‎nb-configuration.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project-shared-configuration>
3+
<!--
4+
This file contains additional configuration written by modules in the NetBeans IDE.
5+
The configuration is intended to be shared among all the users of project and
6+
therefore it is assumed to be part of version control checkout.
7+
Without this configuration present, some functionality in the IDE may be limited or fail altogether.
8+
-->
9+
<properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
10+
<!--
11+
Properties that influence various parts of the IDE, especially code formatting and the like.
12+
You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
13+
That way multiple projects can share the same settings (useful for formatting rules for example).
14+
Any value defined here will override the pom.xml file value but is only applicable to the current project.
15+
-->
16+
<org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>ide</org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>
17+
</properties>
18+
</project-shared-configuration>

‎pom.xml‎

Lines changed: 42 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>org.devdom</groupId>
6-
<version>1.0.5</version>
6+
<version>2.2.0</version>
77
<artifactId>skills-devdom</artifactId>
8+
<packaging>war</packaging>
9+
<name>Dev Dom Skills</name>
810
<properties>
911
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1012
<jersey-version>1.17.1</jersey-version>
1113
<jetty-version>8.0.0.M3</jetty-version>
12-
<jsf-version>2.1.26</jsf-version>
14+
<jsf-version>2.2.6</jsf-version>
1315
</properties>
1416
<dependencies>
1517
<!-- Jetty -->
@@ -18,7 +20,6 @@
1820
<artifactId>jetty-webapp</artifactId>
1921
<version>${jetty-version}</version>
2022
</dependency>
21-
2223
<dependency>
2324
<groupId>org.eclipse.jetty</groupId>
2425
<artifactId>jetty-servlet</artifactId>
@@ -32,23 +33,20 @@
3233
<scope>compile</scope>
3334
<type>jar</type>
3435
</dependency>
35-
3636
<dependency>
3737
<groupId>com.sun.jersey</groupId>
3838
<artifactId>jersey-json</artifactId>
3939
<version>${jersey-version}</version>
4040
<scope>compile</scope>
4141
<type>jar</type>
4242
</dependency>
43-
4443
<dependency>
4544
<groupId>com.sun.jersey</groupId>
4645
<artifactId>jersey-servlet</artifactId>
4746
<version>${jersey-version}</version>
4847
<scope>compile</scope>
4948
<type>jar</type>
5049
</dependency>
51-
5250
<dependency>
5351
<groupId>com.sun.jersey</groupId>
5452
<artifactId>jersey-client</artifactId>
@@ -58,75 +56,70 @@
5856
<dependency>
5957
<groupId>mysql</groupId>
6058
<artifactId>mysql-connector-java</artifactId>
61-
<version>5.1.26</version>
59+
<version>5.1.30</version>
6260
</dependency>
63-
61+
<!-- JPA -->
6462
<dependency>
6563
<groupId>toplink.essentials</groupId>
6664
<artifactId>toplink-essentials</artifactId>
6765
<version>2.1-60f</version>
68-
</dependency>
69-
66+
</dependency>
7067
<dependency>
7168
<groupId>org.eclipse.persistence</groupId>
7269
<artifactId>eclipselink</artifactId>
73-
<version>2.3.2</version>
70+
<version>2.5.1</version>
7471
</dependency>
75-
7672
<dependency>
7773
<groupId>org.eclipse.persistence</groupId>
7874
<artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
79-
<version>2.3.2</version>
80-
</dependency>
81-
75+
<version>2.5.1</version>
76+
</dependency>
8277
<dependency>
8378
<groupId>org.eclipse.persistence</groupId>
8479
<artifactId>javax.persistence</artifactId>
8580
<version>2.1.0</version>
8681
</dependency>
87-
88-
<dependency>
89-
<groupId>org.eclipse.persistence</groupId>
90-
<artifactId>org.eclipse.persistence.core</artifactId>
91-
<version>2.5.1</version>
92-
</dependency>
93-
82+
<!-- Faces -->
9483
<dependency>
9584
<groupId>com.sun.faces</groupId>
9685
<artifactId>jsf-api</artifactId>
9786
<version>${jsf-version}</version>
9887
</dependency>
99-
10088
<dependency>
10189
<groupId>com.sun.faces</groupId>
10290
<artifactId>jsf-impl</artifactId>
10391
<version>${jsf-version}</version>
10492
</dependency>
105-
93+
<!-- EL 2 -->
94+
<dependency>
95+
<groupId>javax.el</groupId>
96+
<artifactId>el-api</artifactId>
97+
<version>2.2</version>
98+
<scope>provided</scope>
99+
</dependency>
100+
<!-- Servlet -->
106101
<dependency>
107102
<groupId>javax.servlet</groupId>
108103
<artifactId>jstl</artifactId>
109104
<version>1.2</version>
110105
</dependency>
111-
112106
<dependency>
113107
<groupId>javax.servlet</groupId>
114108
<artifactId>servlet-api</artifactId>
115109
<version>2.5</version>
110+
<scope>provided</scope>
116111
</dependency>
117-
112+
<dependency>
113+
<groupId>javax</groupId>
114+
<artifactId>javaee-api</artifactId>
115+
<version>7.0</version>
116+
<scope>provided</scope>
117+
</dependency>
118118
<dependency>
119119
<groupId>javax.servlet.jsp</groupId>
120120
<artifactId>jsp-api</artifactId>
121121
<version>2.2</version>
122122
</dependency>
123-
124-
<dependency>
125-
<groupId>org.glassfish.web</groupId>
126-
<artifactId>el-impl</artifactId>
127-
<version>2.2</version>
128-
</dependency>
129-
130123
<!-- jUnit -->
131124
<dependency>
132125
<groupId>junit</groupId>
@@ -137,6 +130,14 @@
137130
</dependencies>
138131
<build>
139132
<plugins>
133+
<plugin>
134+
<groupId>org.apache.maven.plugins</groupId>
135+
<artifactId>maven-war-plugin</artifactId>
136+
<version>2.4</version>
137+
<configuration>
138+
<failOnMissingWebXml>false</failOnMissingWebXml>
139+
</configuration>
140+
</plugin>
140141
<plugin>
141142
<groupId>org.apache.maven.plugins</groupId>
142143
<artifactId>maven-dependency-plugin</artifactId>
@@ -158,6 +159,14 @@
158159
<target>1.7</target>
159160
</configuration>
160161
</plugin>
162+
<plugin>
163+
<groupId>org.mortbay.jetty</groupId>
164+
<artifactId>maven-jetty-plugin</artifactId>
165+
<version>6.1.26</version>
166+
<configuration>
167+
<webapp>${basedir}/target/developer-skills.war</webapp>
168+
</configuration>
169+
</plugin>
161170
</plugins>
162171
<pluginManagement>
163172
<plugins>

‎src/main/java/org/devdom/skills/Main.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import org.eclipse.jetty.server.Server;
44
import org.eclipse.jetty.server.handler.ErrorHandler;
5+
import org.eclipse.jetty.servlet.ServletContextHandler;
56
import org.eclipse.jetty.servlet.ServletHandler;
67
import org.eclipse.jetty.webapp.WebAppContext;
78
/**
@@ -42,11 +43,15 @@ public static void main(String[] args) throws Exception{
4243
Server server = new Server(Integer.valueOf(webPort));
4344
WebAppContext root = new WebAppContext();
4445

46+
ServletContextHandler sch = new ServletContextHandler(server, "");
47+
//sch.setSecurityHandler(getSecurityHandler());
48+
4549
root.setContextPath("/");
4650
root.setDescriptor(webappDirLocation + "/WEB-INF/web.xml");
4751
root.setResourceBase(webappDirLocation);
4852
root.setDisplayName("Dev Dom - Skills");
4953
root.setHandler(servletHandler);
54+
root.setSecurityHandler(null);
5055

5156
// Parent loader priority is a class loader setting that Jetty accepts.
5257
// By default Jetty will behave like most web containers in that it will

0 commit comments

Comments
 (0)