You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2012/02/20 09:25:53 UTC

[3/3] DELTASPIKE-92 rename containerctrl to cdise

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/16ad0a37/deltaspike/containerctrl/tck/src/main/java/org/apache/deltaspike/containerctrl/tck/beans/Car.java
----------------------------------------------------------------------
diff --git a/deltaspike/containerctrl/tck/src/main/java/org/apache/deltaspike/containerctrl/tck/beans/Car.java b/deltaspike/containerctrl/tck/src/main/java/org/apache/deltaspike/containerctrl/tck/beans/Car.java
deleted file mode 100644
index cf22eb6..0000000
--- a/deltaspike/containerctrl/tck/src/main/java/org/apache/deltaspike/containerctrl/tck/beans/Car.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.deltaspike.containerctrl.tck.beans;
-
-
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
-
-@RequestScoped
-public class Car
-{
-    @Inject
-    private User usr;
-
-    public User getUsr()
-    {
-        return usr;
-    }
-
-    public void setUsr(User usr)
-    {
-        this.usr = usr;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/16ad0a37/deltaspike/containerctrl/tck/src/main/java/org/apache/deltaspike/containerctrl/tck/beans/CarRepair.java
----------------------------------------------------------------------
diff --git a/deltaspike/containerctrl/tck/src/main/java/org/apache/deltaspike/containerctrl/tck/beans/CarRepair.java b/deltaspike/containerctrl/tck/src/main/java/org/apache/deltaspike/containerctrl/tck/beans/CarRepair.java
deleted file mode 100644
index c042334..0000000
--- a/deltaspike/containerctrl/tck/src/main/java/org/apache/deltaspike/containerctrl/tck/beans/CarRepair.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.deltaspike.containerctrl.tck.beans;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-
-@ApplicationScoped
-public class CarRepair
-{
-    @Inject
-    private Car car;
-
-    public Car getCar()
-    {
-        return car;
-    }
-
-    public void setCar(Car car)
-    {
-        this.car = car;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/16ad0a37/deltaspike/containerctrl/tck/src/main/java/org/apache/deltaspike/containerctrl/tck/beans/User.java
----------------------------------------------------------------------
diff --git a/deltaspike/containerctrl/tck/src/main/java/org/apache/deltaspike/containerctrl/tck/beans/User.java b/deltaspike/containerctrl/tck/src/main/java/org/apache/deltaspike/containerctrl/tck/beans/User.java
deleted file mode 100644
index 62b29b3..0000000
--- a/deltaspike/containerctrl/tck/src/main/java/org/apache/deltaspike/containerctrl/tck/beans/User.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.deltaspike.containerctrl.tck.beans;
-
-import javax.enterprise.context.SessionScoped;
-import java.io.Serializable;
-
-@SessionScoped
-public class User implements Serializable
-{
-    private String name;
-
-    public String getName()
-    {
-        return name;
-    }
-
-    public void setName(String name)
-    {
-        this.name = name;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/16ad0a37/deltaspike/containerctrl/tck/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/containerctrl/tck/src/main/resources/META-INF/beans.xml b/deltaspike/containerctrl/tck/src/main/resources/META-INF/beans.xml
deleted file mode 100644
index 4070730..0000000
--- a/deltaspike/containerctrl/tck/src/main/resources/META-INF/beans.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<beans xmlns="http://java.sun.com/xml/ns/javaee"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
-</beans>

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/16ad0a37/deltaspike/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/pom.xml b/deltaspike/pom.xml
index 2240071..5a48554 100644
--- a/deltaspike/pom.xml
+++ b/deltaspike/pom.xml
@@ -56,7 +56,7 @@
         <module>parent</module>
         <module>test-utils</module>
         <module>core</module>
-        <module>containerctrl</module>
+        <module>cdise</module>
         <module>modules</module>
     </modules>