Asaf Shakarchi has uploaded a new change for review. Change subject: Removal of a deprecated Public API moudle references ......................................................................
Removal of a deprecated Public API moudle references Removed references from all internal maven modules, makefile and fedora setup files. Change-Id: I14e79f537e3e45e55b95cf3886c32afb8443ea84 Signed-off-by: Asaf Shakarchi <[email protected]> --- M Makefile M ear/pom.xml D frontend/api/pom.xml M frontend/webadmin/modules/frontend/pom.xml M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/Frontend.gwt.xml M frontend/webadmin/modules/gwt-extension/pom.xml M frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/GwtExtension.gwt.xml D frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/genericapi/returnvalues/UIQueryReturnValue_CustomFieldSerializer.java M frontend/webadmin/modules/uicommonweb/pom.xml M frontend/webadmin/modules/userportal-gwtp/pom.xml M frontend/webadmin/modules/webadmin/pom.xml M packaging/fedora/setup/basedefs.py M packaging/fedora/spec/ovirt-engine.spec.in 13 files changed, 15 insertions(+), 134 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/62/11262/1 diff --git a/Makefile b/Makefile index 510039e..07436dc 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,6 @@ engine-notifier-service \ engine-tools-common \ engineencryptutils \ - genericapi \ interface-common-jaxrs \ manager \ manager-modules \ @@ -102,7 +101,6 @@ # no convention yet... OWN_JAR_FIXUPS = \ $(PKG_EAR_DIR)/engine-bll,bll \ - $(PKG_EAR_DIR)/engine-genericapi,genericapi \ $(PKG_EAR_DIR)/engine-scheduler,scheduler \ $(PKG_EAR_DIR)/lib/engine-common,common \ $(PKG_EAR_DIR)/lib/engine-compat,compat \ diff --git a/ear/pom.xml b/ear/pom.xml index d66753b..c1e5812 100644 --- a/ear/pom.xml +++ b/ear/pom.xml @@ -94,13 +94,6 @@ <!-- ** EJB-JARs --> <dependency> - <groupId>org.ovirt.engine.ui</groupId> - <artifactId>genericapi</artifactId> - <version>${engine.version}</version> - <type>ejb</type> - </dependency> - - <dependency> <groupId>org.ovirt.engine.core</groupId> <artifactId>scheduler</artifactId> <version>${engine.version}</version> @@ -242,13 +235,6 @@ </webModule> <!-- ** EJB-JARs --> - <ejbModule> - <groupId>org.ovirt.engine.ui</groupId> - <artifactId>genericapi</artifactId> - <bundleFileName>engine-genericapi.jar</bundleFileName> - <unpack>true</unpack> - </ejbModule> - <ejbModule> <groupId>org.ovirt.engine.core</groupId> <artifactId>scheduler</artifactId> diff --git a/frontend/api/pom.xml b/frontend/api/pom.xml deleted file mode 100644 index 2360b55..0000000 --- a/frontend/api/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ -<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.ovirt.engine.ui</groupId> - <artifactId>frontend-all</artifactId> - <version>3.2.0</version> - </parent> - - <artifactId>api</artifactId> - <packaging>pom</packaging> - <name>oVirt APIs</name> - - <modules> - <module>genericapi</module> - </modules> - - <build> - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - </plugins> - </build> - -</project> diff --git a/frontend/webadmin/modules/frontend/pom.xml b/frontend/webadmin/modules/frontend/pom.xml index 6bbf739..b13f1fe 100644 --- a/frontend/webadmin/modules/frontend/pom.xml +++ b/frontend/webadmin/modules/frontend/pom.xml @@ -17,12 +17,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>${engine.groupId}</groupId> - <artifactId>genericapi</artifactId> - <version>${engine.version}</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-servlet</artifactId> <version>${gwt.version}</version> @@ -37,6 +31,11 @@ <artifactId>jboss-ejb-api_3.1_spec</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.ovirt.engine.core</groupId> + <artifactId>utils</artifactId> + <version>${engine.version}</version> + </dependency> </dependencies> <build> <resources> diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/Frontend.gwt.xml b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/Frontend.gwt.xml index 7090481..65c515e 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/Frontend.gwt.xml +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/Frontend.gwt.xml @@ -3,7 +3,6 @@ <module> <inherits name='com.google.gwt.core.Core' /> <inherits name='org.ovirt.engine.ui.UiCompat' /> - <inherits name='org.ovirt.engine.ui.GenericApi' /> <source path="frontend"> <exclude name="server/**"/> diff --git a/frontend/webadmin/modules/gwt-extension/pom.xml b/frontend/webadmin/modules/gwt-extension/pom.xml index 0fc31e9..3d88cf1 100644 --- a/frontend/webadmin/modules/gwt-extension/pom.xml +++ b/frontend/webadmin/modules/gwt-extension/pom.xml @@ -29,17 +29,21 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>${engine.groupId}</groupId> - <artifactId>genericapi</artifactId> - <version>${engine.version}</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjrt</artifactId> <version>${aspectj.version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.ovirt.engine.core</groupId> + <artifactId>common</artifactId> + <version>${engine.version}</version> + </dependency> + <dependency> + <groupId>org.ovirt.engine.core</groupId> + <artifactId>utils</artifactId> + <version>${engine.version}</version> + </dependency> </dependencies> <build> <plugins> diff --git a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/GwtExtension.gwt.xml b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/GwtExtension.gwt.xml index e452b85..414cdc0 100644 --- a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/GwtExtension.gwt.xml +++ b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/GwtExtension.gwt.xml @@ -4,7 +4,6 @@ <inherits name='com.google.gwt.core.Core' /> <source path=""> - <include name="genericapi/returnvalues/*.java"/> </source> <super-source path="uioverrides" /> diff --git a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/genericapi/returnvalues/UIQueryReturnValue_CustomFieldSerializer.java b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/genericapi/returnvalues/UIQueryReturnValue_CustomFieldSerializer.java deleted file mode 100644 index c674314..0000000 --- a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/genericapi/returnvalues/UIQueryReturnValue_CustomFieldSerializer.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.ovirt.engine.ui.genericapi.returnvalues; - -import com.google.gwt.core.client.GWT; -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.client.rpc.SerializationStreamReader; -import com.google.gwt.user.client.rpc.SerializationStreamWriter; -import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; - -public class UIQueryReturnValue_CustomFieldSerializer { - public static void deserialize(SerializationStreamReader streamReader, - UIQueryReturnValue instance) throws SerializationException { - GWT.log("deserialize UIQueryReturnValue"); - // Handled in instantiate - } - - public static UIQueryReturnValue instantiate( - SerializationStreamReader streamReader) - throws SerializationException { - // occur first - GWT.log("instantiate UIQueryReturnValue"); - - UIQueryReturnValue r = new UIQueryReturnValue(); - r.setSucceeded(streamReader.readBoolean()); - r.setReturnValue(streamReader.readObject()); - - return r; - } - - public static void serialize(SerializationStreamWriter streamWriter, - UIQueryReturnValue instance) throws SerializationException { - streamWriter.writeBoolean(instance.getSucceeded()); - streamWriter.writeObject(instance.getReturnValue()); - } -} diff --git a/frontend/webadmin/modules/uicommonweb/pom.xml b/frontend/webadmin/modules/uicommonweb/pom.xml index 45b01cc..20146cb 100644 --- a/frontend/webadmin/modules/uicommonweb/pom.xml +++ b/frontend/webadmin/modules/uicommonweb/pom.xml @@ -31,13 +31,6 @@ <artifactId>uicompat</artifactId> <version>${engine.version}</version> </dependency> - - <dependency> - <groupId>${engine.groupId}</groupId> - <artifactId>genericapi</artifactId> - <version>${engine.version}</version> - <scope>provided</scope> - </dependency> </dependencies> <build> diff --git a/frontend/webadmin/modules/userportal-gwtp/pom.xml b/frontend/webadmin/modules/userportal-gwtp/pom.xml index 96e8229..65ffb63 100644 --- a/frontend/webadmin/modules/userportal-gwtp/pom.xml +++ b/frontend/webadmin/modules/userportal-gwtp/pom.xml @@ -93,12 +93,6 @@ </dependency> <dependency> <groupId>${engine.groupId}</groupId> - <artifactId>genericapi</artifactId> - <version>${engine.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>${engine.groupId}</groupId> <artifactId>frontend</artifactId> <version>${engine.version}</version> </dependency> diff --git a/frontend/webadmin/modules/webadmin/pom.xml b/frontend/webadmin/modules/webadmin/pom.xml index 0ce5e74..c6d402c 100644 --- a/frontend/webadmin/modules/webadmin/pom.xml +++ b/frontend/webadmin/modules/webadmin/pom.xml @@ -93,12 +93,6 @@ </dependency> <dependency> <groupId>${engine.groupId}</groupId> - <artifactId>genericapi</artifactId> - <version>${engine.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>${engine.groupId}</groupId> <artifactId>frontend</artifactId> <version>${engine.version}</version> </dependency> diff --git a/packaging/fedora/setup/basedefs.py b/packaging/fedora/setup/basedefs.py index f8b03a2..a89eee0 100644 --- a/packaging/fedora/setup/basedefs.py +++ b/packaging/fedora/setup/basedefs.py @@ -203,7 +203,6 @@ {name}-backend {name}-config {name}-dbscripts -{name}-genericapi {name}-notification-service {name}-restapi {name}-tools-common diff --git a/packaging/fedora/spec/ovirt-engine.spec.in b/packaging/fedora/spec/ovirt-engine.spec.in index 8288b16..2b8feab 100644 --- a/packaging/fedora/spec/ovirt-engine.spec.in +++ b/packaging/fedora/spec/ovirt-engine.spec.in @@ -182,7 +182,6 @@ # main package is installed: Requires: %{name}-backend = %{version}-%{release} Requires: %{name}-restapi = %{version}-%{release} -Requires: %{name}-genericapi = %{version}-%{release} Requires: %{name}-userportal = %{version}-%{release} Requires: %{name}-config = %{version}-%{release} Requires: %{name}-notification-service = %{version}-%{release} @@ -251,15 +250,6 @@ %description restapi The RESTful API for %{product_name_short} - - -%package genericapi -Summary: Generic API for %{product_name_short} -Group: Virtualization/Management -Requires: %{name} = %{version}-%{release} - -%description genericapi -The generic API for %{product_name_short} %package setup @@ -759,20 +749,6 @@ # Everything inside of the web application is owned by this # subpackage: %{restapi_war} - - -%files genericapi - -# Jar files: -%{engine_java}/genericapi.jar - -# POM files: -%if %{install_poms} -%{_mavenpomdir}/JPP.%{name}-genericapi.pom -%endif - -# Link to the jar file inside the ear: -%{engine_ear}/engine-genericapi.jar %files userportal -- To view, visit http://gerrit.ovirt.org/11262 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I14e79f537e3e45e55b95cf3886c32afb8443ea84 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Asaf Shakarchi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
