Author: solomax Date: Fri Aug 19 07:28:35 2016 New Revision: 1756875 URL: http://svn.apache.org/viewvc?rev=1756875&view=rev Log: [OPENMEETINGS-1453] API is modified to retrieve full info
Added: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/Info.java openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/Info.java openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/Info.java Modified: openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/InfoWebService.java openmeetings/application/branches/3.2.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/InfoWebService.java openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/InfoWebService.java Added: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/Info.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/Info.java?rev=1756875&view=auto ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/Info.java (added) +++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/Info.java Fri Aug 19 07:28:35 2016 @@ -0,0 +1,54 @@ +/* + * 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.openmeetings.db.dto.basic; + +import java.io.Serializable; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; + +import org.apache.openmeetings.util.Version; + +@XmlRootElement +@XmlAccessorType(XmlAccessType.FIELD) +public class Info implements Serializable { + private static final long serialVersionUID = 1L; + private final String version; + private final String revision; + private final String buildDate; + + public Info() { + version = Version.getVersion(); + revision = Version.getRevision(); + buildDate = Version.getBuildDate(); + } + + public String getVersion() { + return version; + } + + public String getRevision() { + return revision; + } + + public String getBuildDate() { + return buildDate; + } +} Modified: openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/InfoWebService.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/InfoWebService.java?rev=1756875&r1=1756874&r2=1756875&view=diff ============================================================================== --- openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/InfoWebService.java (original) +++ openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/InfoWebService.java Fri Aug 19 07:28:35 2016 @@ -28,7 +28,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import org.apache.cxf.feature.Features; -import org.apache.openmeetings.util.Version; +import org.apache.openmeetings.db.dto.basic.Info; /** * @@ -50,7 +50,7 @@ public class InfoWebService { @WebMethod @GET @Path("/version") - public String getVersion() { - return Version.getVersion(); + public Info getVersion() { + return new Info(); } } Added: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/Info.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/Info.java?rev=1756875&view=auto ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/Info.java (added) +++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/Info.java Fri Aug 19 07:28:35 2016 @@ -0,0 +1,54 @@ +/* + * 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.openmeetings.db.dto.basic; + +import java.io.Serializable; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; + +import org.apache.openmeetings.util.Version; + +@XmlRootElement +@XmlAccessorType(XmlAccessType.FIELD) +public class Info implements Serializable { + private static final long serialVersionUID = 1L; + private final String version; + private final String revision; + private final String buildDate; + + public Info() { + version = Version.getVersion(); + revision = Version.getRevision(); + buildDate = Version.getBuildDate(); + } + + public String getVersion() { + return version; + } + + public String getRevision() { + return revision; + } + + public String getBuildDate() { + return buildDate; + } +} Modified: openmeetings/application/branches/3.2.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/InfoWebService.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/InfoWebService.java?rev=1756875&r1=1756874&r2=1756875&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/InfoWebService.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/InfoWebService.java Fri Aug 19 07:28:35 2016 @@ -28,7 +28,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import org.apache.cxf.feature.Features; -import org.apache.openmeetings.util.Version; +import org.apache.openmeetings.db.dto.basic.Info; /** * @@ -50,7 +50,7 @@ public class InfoWebService { @WebMethod @GET @Path("/version") - public String getVersion() { - return Version.getVersion(); + public Info getVersion() { + return new Info(); } } Added: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/Info.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/Info.java?rev=1756875&view=auto ============================================================================== --- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/Info.java (added) +++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/Info.java Fri Aug 19 07:28:35 2016 @@ -0,0 +1,54 @@ +/* + * 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.openmeetings.db.dto.basic; + +import java.io.Serializable; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; + +import org.apache.openmeetings.util.Version; + +@XmlRootElement +@XmlAccessorType(XmlAccessType.FIELD) +public class Info implements Serializable { + private static final long serialVersionUID = 1L; + private final String version; + private final String revision; + private final String buildDate; + + public Info() { + version = Version.getVersion(); + revision = Version.getRevision(); + buildDate = Version.getBuildDate(); + } + + public String getVersion() { + return version; + } + + public String getRevision() { + return revision; + } + + public String getBuildDate() { + return buildDate; + } +} Modified: openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/InfoWebService.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/InfoWebService.java?rev=1756875&r1=1756874&r2=1756875&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/InfoWebService.java (original) +++ openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/InfoWebService.java Fri Aug 19 07:28:35 2016 @@ -28,7 +28,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import org.apache.cxf.feature.Features; -import org.apache.openmeetings.util.Version; +import org.apache.openmeetings.db.dto.basic.Info; /** * @@ -50,7 +50,7 @@ public class InfoWebService { @WebMethod @GET @Path("/version") - public String getVersion() { - return Version.getVersion(); + public Info getVersion() { + return new Info(); } }