You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by gp...@apache.org on 2013/03/31 17:05:10 UTC
[1/2] git commit: DELTASPIKE-288 cleanup of packages
Updated Branches:
refs/heads/master aafccd652 -> 998f23081
DELTASPIKE-288 cleanup of packages
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/e696bd76
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/e696bd76
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/e696bd76
Branch: refs/heads/master
Commit: e696bd7619970d1c2747b45217866a870ab5848a
Parents: aafccd6
Author: gpetracek <gp...@apache.org>
Authored: Sun Mar 31 16:54:59 2013 +0200
Committer: gpetracek <gp...@apache.org>
Committed: Sun Mar 31 16:54:59 2013 +0200
----------------------------------------------------------------------
.../view/navigation/NavigationParameter.java | 80 +++++++++++++++
.../navigation/NavigationParameterContext.java | 32 ++++++
.../view/navigation/ViewNavigationHandler.java | 34 ++++++
.../event/PreViewConfigNavigateEvent.java | 73 +++++++++++++
.../jsf/api/config/view/NavigationParameter.java | 80 ---------------
.../view/event/PreViewConfigNavigateEvent.java | 73 -------------
.../api/navigation/NavigationParameterContext.java | 32 ------
.../jsf/api/navigation/ViewNavigationHandler.java | 34 ------
.../DefaultNavigationParameterContext.java | 2 +-
.../navigation/DefaultViewNavigationHandler.java | 2 +-
.../ViewConfigAwareNavigationHandler.java | 6 +-
.../apache/deltaspike/jsf/impl/util/JsfUtils.java | 2 +-
.../deltaspike/jsf/impl/util/SecurityUtils.java | 2 +-
.../view/navigation/event/uc001/PageBean002.java | 2 +-
.../navigation/parameter/uc002/PageBean002.java | 2 +-
.../navigation/parameter/uc003/PageBean003.java | 2 +-
.../navigation/parameter/uc004/PageBean004.java | 5 +-
.../view/navigation/parameter/uc005/Pages.java | 2 +-
.../navigation/parameter/uc006/PageBean006.java | 2 +-
19 files changed, 234 insertions(+), 233 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e696bd76/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/navigation/NavigationParameter.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/navigation/NavigationParameter.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/navigation/NavigationParameter.java
new file mode 100644
index 0000000..349a26d
--- /dev/null
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/navigation/NavigationParameter.java
@@ -0,0 +1,80 @@
+/*
+ * 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.core.api.config.view.navigation;
+
+import org.apache.deltaspike.core.api.config.view.metadata.annotation.Aggregated;
+import org.apache.deltaspike.core.api.config.view.metadata.annotation.ViewMetaData;
+
+import javax.enterprise.util.Nonbinding;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * This annotation can be used as interceptor for JSF action methods as an alternative for
+ * {@link org.apache.deltaspike.core.api.config.view.navigation.NavigationParameterContext}.
+ */
+@Target({ METHOD, TYPE })
+@Retention(RUNTIME)
+@Documented
+
+@ViewMetaData
+@Aggregated(true)
+//TODO @InterceptorBinding
+public @interface NavigationParameter
+{
+ /**
+ * Key of the parameter
+ *
+ * @return name of the key
+ */
+ @Nonbinding String key();
+
+ /**
+ * Value or EL-Expression of the parameter
+ *
+ * @return ref or expression
+ */
+ @Nonbinding String value();
+
+ @Target({ METHOD, TYPE })
+ @Retention(RUNTIME)
+ @Documented
+
+ //TODO add special support for list-annotations (add value automatically)
+ /**
+ * Allows to specify multiple parameters (@see ViewParameter)
+ */
+ @ViewMetaData
+ @Aggregated(true)
+ //TODO @InterceptorBinding
+ public static @interface List
+ {
+ /**
+ * 1-n parameters
+ *
+ * @return parameters
+ */
+ @Nonbinding NavigationParameter[] value();
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e696bd76/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/navigation/NavigationParameterContext.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/navigation/NavigationParameterContext.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/navigation/NavigationParameterContext.java
new file mode 100644
index 0000000..207ad02
--- /dev/null
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/navigation/NavigationParameterContext.java
@@ -0,0 +1,32 @@
+/*
+ * 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.core.api.config.view.navigation;
+
+import java.io.Serializable;
+import java.util.Map;
+
+/**
+ * Can be used to add parameters dynamically to the final navigation string
+ */
+public interface NavigationParameterContext extends Serializable
+{
+ void addPageParameter(String key, Object value);
+
+ Map<String, String> getPageParameters();
+}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e696bd76/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/navigation/ViewNavigationHandler.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/navigation/ViewNavigationHandler.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/navigation/ViewNavigationHandler.java
new file mode 100644
index 0000000..80b8fd3
--- /dev/null
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/navigation/ViewNavigationHandler.java
@@ -0,0 +1,34 @@
+/*
+ * 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.core.api.config.view.navigation;
+
+import org.apache.deltaspike.core.api.config.view.ViewConfig;
+
+/**
+ * Allows to trigger manual navigation via the type-safe {@link ViewConfig} approach.
+ */
+public interface ViewNavigationHandler
+{
+ /**
+ * Triggers navigation to the given view.
+ *
+ * @param targetView the view which is the navigation target
+ */
+ void navigateTo(Class<? extends ViewConfig> targetView);
+}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e696bd76/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/navigation/event/PreViewConfigNavigateEvent.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/navigation/event/PreViewConfigNavigateEvent.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/navigation/event/PreViewConfigNavigateEvent.java
new file mode 100644
index 0000000..110cf61
--- /dev/null
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/navigation/event/PreViewConfigNavigateEvent.java
@@ -0,0 +1,73 @@
+/*
+ * 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.core.api.config.view.navigation.event;
+
+import org.apache.deltaspike.core.api.config.view.ViewConfig;
+
+/**
+ * Event will be fired before the navigation (from and to a view-config based page) occurs.
+ * With {@link #navigateTo(Class)} it's possible to change the navigation target.
+ */
+public class PreViewConfigNavigateEvent
+{
+ private final Class<? extends ViewConfig> fromView;
+ private Class<? extends ViewConfig> toView;
+
+ /**
+ * Constructor for creating the event for the given source and target view
+ *
+ * @param fromView source-view
+ * @param toView target-view
+ */
+ public PreViewConfigNavigateEvent(Class<? extends ViewConfig> fromView, Class<? extends ViewConfig> toView)
+ {
+ this.fromView = fromView;
+ this.toView = toView;
+ }
+
+ /**
+ * Provides the navigation source.
+ *
+ * @return source of the navigation
+ */
+ public Class<? extends ViewConfig> getFromView()
+ {
+ return fromView;
+ }
+
+ /**
+ * Provides the navigation target.
+ *
+ * @return target of the navigation
+ */
+ public Class<? extends ViewConfig> getToView()
+ {
+ return toView;
+ }
+
+ /**
+ * Allows to change the navigation target.
+ *
+ * @param toView new navigation target
+ */
+ public void navigateTo(Class<? extends ViewConfig> toView)
+ {
+ this.toView = toView;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e696bd76/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/NavigationParameter.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/NavigationParameter.java b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/NavigationParameter.java
deleted file mode 100644
index 65e1faa..0000000
--- a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/NavigationParameter.java
+++ /dev/null
@@ -1,80 +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.jsf.api.config.view;
-
-import org.apache.deltaspike.core.api.config.view.metadata.annotation.Aggregated;
-import org.apache.deltaspike.core.api.config.view.metadata.annotation.ViewMetaData;
-
-import javax.enterprise.util.Nonbinding;
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * This annotation can be used as interceptor for JSF action methods as an alternative for
- * {@link org.apache.deltaspike.jsf.api.navigation.NavigationParameterContext}.
- */
-@Target({ METHOD, TYPE })
-@Retention(RUNTIME)
-@Documented
-
-@ViewMetaData
-@Aggregated(true)
-//TODO @InterceptorBinding
-public @interface NavigationParameter
-{
- /**
- * Key of the parameter
- *
- * @return name of the key
- */
- @Nonbinding String key();
-
- /**
- * Value or EL-Expression of the parameter
- *
- * @return ref or expression
- */
- @Nonbinding String value();
-
- @Target({ METHOD, TYPE })
- @Retention(RUNTIME)
- @Documented
-
- //TODO add special support for list-annotations (add value automatically)
- /**
- * Allows to specify multiple parameters (@see ViewParameter)
- */
- @ViewMetaData
- @Aggregated(true)
- //TODO @InterceptorBinding
- public static @interface List
- {
- /**
- * 1-n parameters
- *
- * @return parameters
- */
- @Nonbinding NavigationParameter[] value();
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e696bd76/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/event/PreViewConfigNavigateEvent.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/event/PreViewConfigNavigateEvent.java b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/event/PreViewConfigNavigateEvent.java
deleted file mode 100644
index 530489e..0000000
--- a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/event/PreViewConfigNavigateEvent.java
+++ /dev/null
@@ -1,73 +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.jsf.api.config.view.event;
-
-import org.apache.deltaspike.core.api.config.view.ViewConfig;
-
-/**
- * Event will be fired before the navigation (from and to a view-config based page) occurs.
- * With {@link #navigateTo(Class)} it's possible to change the navigation target.
- */
-public class PreViewConfigNavigateEvent
-{
- private final Class<? extends ViewConfig> fromView;
- private Class<? extends ViewConfig> toView;
-
- /**
- * Constructor for creating the event for the given source and target view
- *
- * @param fromView source-view
- * @param toView target-view
- */
- public PreViewConfigNavigateEvent(Class<? extends ViewConfig> fromView, Class<? extends ViewConfig> toView)
- {
- this.fromView = fromView;
- this.toView = toView;
- }
-
- /**
- * Provides the navigation source.
- *
- * @return source of the navigation
- */
- public Class<? extends ViewConfig> getFromView()
- {
- return fromView;
- }
-
- /**
- * Provides the navigation target.
- *
- * @return target of the navigation
- */
- public Class<? extends ViewConfig> getToView()
- {
- return toView;
- }
-
- /**
- * Allows to change the navigation target.
- *
- * @param toView new navigation target
- */
- public void navigateTo(Class<? extends ViewConfig> toView)
- {
- this.toView = toView;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e696bd76/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/navigation/NavigationParameterContext.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/navigation/NavigationParameterContext.java b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/navigation/NavigationParameterContext.java
deleted file mode 100644
index 0b84013..0000000
--- a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/navigation/NavigationParameterContext.java
+++ /dev/null
@@ -1,32 +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.jsf.api.navigation;
-
-import java.io.Serializable;
-import java.util.Map;
-
-/**
- * Can be used to add parameters dynamically to the final navigation string
- */
-public interface NavigationParameterContext extends Serializable
-{
- void addPageParameter(String key, Object value);
-
- Map<String, String> getPageParameters();
-}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e696bd76/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/navigation/ViewNavigationHandler.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/navigation/ViewNavigationHandler.java b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/navigation/ViewNavigationHandler.java
deleted file mode 100644
index 36b177e..0000000
--- a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/navigation/ViewNavigationHandler.java
+++ /dev/null
@@ -1,34 +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.jsf.api.navigation;
-
-import org.apache.deltaspike.core.api.config.view.ViewConfig;
-
-/**
- * Allows to trigger manual navigation via the type-safe {@link ViewConfig} approach.
- */
-public interface ViewNavigationHandler
-{
- /**
- * Triggers navigation to the given view.
- *
- * @param targetView the view which is the navigation target
- */
- void navigateTo(Class<? extends ViewConfig> targetView);
-}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e696bd76/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/navigation/DefaultNavigationParameterContext.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/navigation/DefaultNavigationParameterContext.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/navigation/DefaultNavigationParameterContext.java
index 62f1c3e..3736349 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/navigation/DefaultNavigationParameterContext.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/navigation/DefaultNavigationParameterContext.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.jsf.impl.navigation;
-import org.apache.deltaspike.jsf.api.navigation.NavigationParameterContext;
+import org.apache.deltaspike.core.api.config.view.navigation.NavigationParameterContext;
import org.apache.deltaspike.jsf.impl.util.JsfUtils;
import javax.enterprise.context.RequestScoped;
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e696bd76/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/navigation/DefaultViewNavigationHandler.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/navigation/DefaultViewNavigationHandler.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/navigation/DefaultViewNavigationHandler.java
index ee0228a..153b58d 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/navigation/DefaultViewNavigationHandler.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/navigation/DefaultViewNavigationHandler.java
@@ -19,7 +19,7 @@
package org.apache.deltaspike.jsf.impl.navigation;
import org.apache.deltaspike.core.api.config.view.ViewConfig;
-import org.apache.deltaspike.jsf.api.navigation.ViewNavigationHandler;
+import org.apache.deltaspike.core.api.config.view.navigation.ViewNavigationHandler;
import javax.enterprise.context.ApplicationScoped;
import javax.faces.context.FacesContext;
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e696bd76/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/navigation/ViewConfigAwareNavigationHandler.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/navigation/ViewConfigAwareNavigationHandler.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/navigation/ViewConfigAwareNavigationHandler.java
index 2f35c05..1429f00 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/navigation/ViewConfigAwareNavigationHandler.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/navigation/ViewConfigAwareNavigationHandler.java
@@ -25,10 +25,10 @@ import org.apache.deltaspike.core.api.config.view.metadata.ViewConfigResolver;
import org.apache.deltaspike.core.api.provider.BeanManagerProvider;
import org.apache.deltaspike.core.api.provider.BeanProvider;
import org.apache.deltaspike.core.util.ClassUtils;
-import org.apache.deltaspike.jsf.api.config.view.NavigationParameter;
+import org.apache.deltaspike.core.api.config.view.navigation.NavigationParameter;
import org.apache.deltaspike.jsf.api.config.view.View;
-import org.apache.deltaspike.jsf.api.config.view.event.PreViewConfigNavigateEvent;
-import org.apache.deltaspike.jsf.api.navigation.NavigationParameterContext;
+import org.apache.deltaspike.core.api.config.view.navigation.event.PreViewConfigNavigateEvent;
+import org.apache.deltaspike.core.api.config.view.navigation.NavigationParameterContext;
import org.apache.deltaspike.jsf.impl.util.JsfUtils;
import javax.enterprise.inject.spi.BeanManager;
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e696bd76/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/JsfUtils.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/JsfUtils.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/JsfUtils.java
index 26fa481..734ebb0 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/JsfUtils.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/JsfUtils.java
@@ -20,7 +20,7 @@ package org.apache.deltaspike.jsf.impl.util;
import org.apache.deltaspike.core.api.config.view.metadata.ViewConfigResolver;
import org.apache.deltaspike.core.api.provider.BeanProvider;
-import org.apache.deltaspike.jsf.api.navigation.NavigationParameterContext;
+import org.apache.deltaspike.core.api.config.view.navigation.NavigationParameterContext;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e696bd76/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/SecurityUtils.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/SecurityUtils.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/SecurityUtils.java
index 2fca938..308a7c5 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/SecurityUtils.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/SecurityUtils.java
@@ -24,7 +24,7 @@ import org.apache.deltaspike.core.api.config.view.metadata.ConfigDescriptor;
import org.apache.deltaspike.core.api.config.view.metadata.ViewConfigDescriptor;
import org.apache.deltaspike.core.api.config.view.metadata.ViewConfigResolver;
import org.apache.deltaspike.core.api.provider.BeanProvider;
-import org.apache.deltaspike.jsf.api.navigation.ViewNavigationHandler;
+import org.apache.deltaspike.core.api.config.view.navigation.ViewNavigationHandler;
import org.apache.deltaspike.security.api.authorization.AccessDecisionState;
import org.apache.deltaspike.security.api.authorization.AccessDeniedException;
import org.apache.deltaspike.security.api.authorization.ErrorViewAwareAccessDeniedException;
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e696bd76/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/event/uc001/PageBean002.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/event/uc001/PageBean002.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/event/uc001/PageBean002.java
index b943bff..ed27cb4 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/event/uc001/PageBean002.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/event/uc001/PageBean002.java
@@ -20,7 +20,7 @@ package org.apache.deltaspike.test.jsf.impl.config.view.navigation.event.uc001;
import org.apache.deltaspike.core.api.config.view.DefaultErrorView;
import org.apache.deltaspike.core.api.config.view.ViewConfig;
-import org.apache.deltaspike.jsf.api.config.view.event.PreViewConfigNavigateEvent;
+import org.apache.deltaspike.core.api.config.view.navigation.event.PreViewConfigNavigateEvent;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.Model;
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e696bd76/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc002/PageBean002.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc002/PageBean002.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc002/PageBean002.java
index cc46666..1827097 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc002/PageBean002.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc002/PageBean002.java
@@ -19,7 +19,7 @@
package org.apache.deltaspike.test.jsf.impl.config.view.navigation.parameter.uc002;
import org.apache.deltaspike.core.api.config.view.ViewConfig;
-import org.apache.deltaspike.jsf.api.config.view.NavigationParameter;
+import org.apache.deltaspike.core.api.config.view.navigation.NavigationParameter;
import javax.enterprise.inject.Model;
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e696bd76/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc003/PageBean003.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc003/PageBean003.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc003/PageBean003.java
index e3d071f..2724b81 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc003/PageBean003.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc003/PageBean003.java
@@ -19,7 +19,7 @@
package org.apache.deltaspike.test.jsf.impl.config.view.navigation.parameter.uc003;
import org.apache.deltaspike.core.api.config.view.ViewConfig;
-import org.apache.deltaspike.jsf.api.config.view.NavigationParameter;
+import org.apache.deltaspike.core.api.config.view.navigation.NavigationParameter;
import javax.enterprise.inject.Model;
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e696bd76/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc004/PageBean004.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc004/PageBean004.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc004/PageBean004.java
index 34a1476..e8b4d42 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc004/PageBean004.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc004/PageBean004.java
@@ -19,15 +19,16 @@
package org.apache.deltaspike.test.jsf.impl.config.view.navigation.parameter.uc004;
import org.apache.deltaspike.core.api.config.view.ViewConfig;
-import org.apache.deltaspike.jsf.api.navigation.NavigationParameterContext;
+import org.apache.deltaspike.core.api.config.view.navigation.NavigationParameterContext;
import javax.enterprise.context.SessionScoped;
import javax.inject.Inject;
import javax.inject.Named;
+import java.io.Serializable;
@Named
@SessionScoped
-public class PageBean004
+public class PageBean004 implements Serializable
{
private int currentValue = -100;
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e696bd76/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc005/Pages.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc005/Pages.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc005/Pages.java
index c9c5e12..26b26a7 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc005/Pages.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc005/Pages.java
@@ -19,7 +19,7 @@
package org.apache.deltaspike.test.jsf.impl.config.view.navigation.parameter.uc005;
import org.apache.deltaspike.core.api.config.view.ViewConfig;
-import org.apache.deltaspike.jsf.api.config.view.NavigationParameter;
+import org.apache.deltaspike.core.api.config.view.navigation.NavigationParameter;
//TODO add tests
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e696bd76/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc006/PageBean006.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc006/PageBean006.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc006/PageBean006.java
index ea31e12..b5e12a5 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc006/PageBean006.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/parameter/uc006/PageBean006.java
@@ -19,7 +19,7 @@
package org.apache.deltaspike.test.jsf.impl.config.view.navigation.parameter.uc006;
import org.apache.deltaspike.core.api.config.view.DefaultErrorView;
-import org.apache.deltaspike.jsf.api.navigation.ViewNavigationHandler;
+import org.apache.deltaspike.core.api.config.view.navigation.ViewNavigationHandler;
import javax.enterprise.inject.Model;
import javax.inject.Inject;
[2/2] git commit: fixed transitive dependency
Posted by gp...@apache.org.
fixed transitive dependency
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/998f2308
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/998f2308
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/998f2308
Branch: refs/heads/master
Commit: 998f23081ca125ecef6798a09cbe58cc9cfedae3
Parents: e696bd7
Author: gpetracek <gp...@apache.org>
Authored: Sun Mar 31 17:02:51 2013 +0200
Committer: gpetracek <gp...@apache.org>
Committed: Sun Mar 31 17:02:57 2013 +0200
----------------------------------------------------------------------
deltaspike/modules/jsf/impl/pom.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/998f2308/deltaspike/modules/jsf/impl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/pom.xml b/deltaspike/modules/jsf/impl/pom.xml
index b2db832..c71899f 100644
--- a/deltaspike/modules/jsf/impl/pom.xml
+++ b/deltaspike/modules/jsf/impl/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.deltaspike.modules</groupId>
<artifactId>deltaspike-security-module-impl</artifactId>
- <scope>test</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>