Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed project's naming conventions #315

Merged
merged 4 commits into from
Jul 8, 2015
Merged

fixed project's naming conventions #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06dbcfb
fixed project's naming conventions
rhanus Jun 27, 2015
b376ada
Merge branch 'master' of https://github.com/javaee-samples/javaee7-sa…
rhanus Jul 4, 2015
bf4482d
refactored cdi-beanmanager sample to use Arquillian exclusively inste…
rhanus Jul 7, 2015
6b84efd
refactored cdi-beanmanager sample to use Arquillian exclusively inste…
rhanus Jul 8, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions cdi/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ The [JSR 346](https://jcp.org/en/jsr/detail?id=346) updates and clarifications t
- nobeans-el-injection
- nobeans-el-injection-flowscoped
- events
- events-conditional-reception
- instance
- instance-qualifiers

## How to run

Expand Down
27 changes: 11 additions & 16 deletions cdi/beanmanager/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.javaee7</groupId>
<artifactId>cdi</artifactId>
<version>1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.javaee7</groupId>
<artifactId>cdi-beanmanager</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>war</packaging>
<name>Java EE 7 Sample: cdi - beanmanager</name>
<parent>
<groupId>org.javaee7</groupId>
<artifactId>cdi</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<artifactId>cdi-beanmanager</artifactId>
<name>Java EE 7 Sample: cdi - beanmanager</name>

<properties>
<netbeans.hint.deploy.server>gfv3ee6</netbeans.hint.deploy.server>
</properties>
</project>
2 changes: 1 addition & 1 deletion ...aee7/cdisamples/beanmanager/Greeting.java → ...org/javaee7/cdi/beanmanager/Greeting.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.javaee7.cdisamples.beanmanager;
package org.javaee7.cdi.beanmanager;

/**
* @author Arun Gupta
Expand Down
2 changes: 1 addition & 1 deletion ...disamples/beanmanager/SimpleGreeting.java → ...vaee7/cdi/beanmanager/SimpleGreeting.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.javaee7.cdisamples.beanmanager;
package org.javaee7.cdi.beanmanager;

/**
* @author Arun Gupta
Expand Down
2 changes: 1 addition & 1 deletion ...disamples/beanmanager/SmileyGreeting.java → ...vaee7/cdi/beanmanager/SmileyGreeting.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.javaee7.cdisamples.beanmanager;
package org.javaee7.cdi.beanmanager;

/**
* @author Arun Gupta
Expand Down
95 changes: 0 additions & 95 deletions cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/TestServletCurrent.java
View file
Open in desktop

This file was deleted.

96 changes: 0 additions & 96 deletions cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/TestServletInject.java
View file
Open in desktop

This file was deleted.

103 changes: 0 additions & 103 deletions cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/TestServletJNDI.java
View file
Open in desktop

This file was deleted.

Empty file removed cdi/beanmanager/src/main/webapp/WEB-INF/beans.xml
View file
Open in desktop
Empty file.
Loading