Skip to content

Commit

Permalink
Version 6.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
seitenbau-govdata committed Oct 20, 2023
1 parent 5111a8e commit a191727
Show file tree
Hide file tree
Showing 77 changed files with 640 additions and 1,003 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## v6.4.0 2023-10-19

* Supports Liferay version 7.4.3.95 GA95 now

## v6.3.0 2023-10-10

* Improves the error message in the metadata edit form if an user does not have enough rights to save a metadata
Expand Down
2 changes: 1 addition & 1 deletion Layout20-80-layouttpl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>od-platform</artifactId>
<groupId>de.seitenbau.govdata.odp</groupId>
<version>6.3.0</version>
<version>6.4.0</version>
</parent>
<artifactId>Layout20-80-layouttpl</artifactId>
<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion boxes-portlet/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>od-platform</artifactId>
<groupId>de.seitenbau.govdata.odp</groupId>
<version>6.3.0</version>
<version>6.4.0</version>
</parent>
<artifactId>boxes-portlet</artifactId>
<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion categories-grid-portlet/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>od-platform</artifactId>
<groupId>de.seitenbau.govdata.odp</groupId>
<version>6.3.0</version>
<version>6.4.0</version>
</parent>
<artifactId>categories-grid-portlet</artifactId>
<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion entities/entities-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.fhg.fokus.odp</groupId>
<artifactId>entities</artifactId>
<version>6.3.0</version>
<version>6.4.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
/**
* Copyright (c) 2000-present Liferay, Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 2.1 of the License, or (at your option)
* any later version.
*
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
* SPDX-FileCopyrightText: (c) 2023 Liferay, Inc. https://liferay.com
* SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
*/

package de.fhg.fokus.odp.entities.model;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
/**
* Copyright (c) 2000-present Liferay, Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 2.1 of the License, or (at your option)
* any later version.
*
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
* SPDX-FileCopyrightText: (c) 2023 Liferay, Inc. https://liferay.com
* SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
*/

package de.fhg.fokus.odp.entities.model;
Expand Down Expand Up @@ -145,4 +136,8 @@ public interface MetadataCommentModel extends BaseModel<MetadataComment> {
@Override
public MetadataComment cloneWithOriginalValues();

public default String toXmlString() {
return null;
}

}
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
/**
* Copyright (c) 2000-present Liferay, Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 2.1 of the License, or (at your option)
* any later version.
*
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
* SPDX-FileCopyrightText: (c) 2023 Liferay, Inc. https://liferay.com
* SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
*/

package de.fhg.fokus.odp.entities.model;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
/**
* Copyright (c) 2000-present Liferay, Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 2.1 of the License, or (at your option)
* any later version.
*
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
* SPDX-FileCopyrightText: (c) 2023 Liferay, Inc. https://liferay.com
* SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
*/

package de.fhg.fokus.odp.entities.model;
Expand Down Expand Up @@ -241,6 +232,11 @@ public void setUuid(String uuid) {
model.setUuid(uuid);
}

@Override
public String toXmlString() {
return model.toXmlString();
}

@Override
protected MetadataCommentWrapper wrap(MetadataComment metadataComment) {
return new MetadataCommentWrapper(metadataComment);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
/**
* Copyright (c) 2000-present Liferay, Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 2.1 of the License, or (at your option)
* any later version.
*
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
* SPDX-FileCopyrightText: (c) 2023 Liferay, Inc. https://liferay.com
* SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
*/

package de.fhg.fokus.odp.entities.service;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
/**
* Copyright (c) 2000-present Liferay, Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 2.1 of the License, or (at your option)
* any later version.
*
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
* SPDX-FileCopyrightText: (c) 2023 Liferay, Inc. https://liferay.com
* SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
*/

package de.fhg.fokus.odp.entities.service;
Expand Down Expand Up @@ -328,6 +319,10 @@ public static MetadataCommentLocalService getService() {
return _service;
}

public static void setService(MetadataCommentLocalService service) {
_service = service;
}

private static volatile MetadataCommentLocalService _service;

}
Original file line number Diff line number Diff line change
@@ -1,20 +1,12 @@
/**
* Copyright (c) 2000-present Liferay, Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 2.1 of the License, or (at your option)
* any later version.
*
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
* SPDX-FileCopyrightText: (c) 2023 Liferay, Inc. https://liferay.com
* SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
*/

package de.fhg.fokus.odp.entities.service;

import com.liferay.portal.kernel.service.ServiceWrapper;
import com.liferay.portal.kernel.service.persistence.BasePersistence;

/**
* Provides a wrapper for {@link MetadataCommentLocalService}.
Expand Down Expand Up @@ -362,6 +354,11 @@ public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
metadataComment);
}

@Override
public BasePersistence<?> getBasePersistence() {
return _metadataCommentLocalService.getBasePersistence();
}

@Override
public MetadataCommentLocalService getWrappedService() {
return _metadataCommentLocalService;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
/**
* Copyright (c) 2000-present Liferay, Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 2.1 of the License, or (at your option)
* any later version.
*
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
* SPDX-FileCopyrightText: (c) 2023 Liferay, Inc. https://liferay.com
* SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
*/

package de.fhg.fokus.odp.entities.service.persistence;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
/**
* Copyright (c) 2000-present Liferay, Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 2.1 of the License, or (at your option)
* any later version.
*
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
* SPDX-FileCopyrightText: (c) 2023 Liferay, Inc. https://liferay.com
* SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
*/

package de.fhg.fokus.odp.entities.service.persistence;
Expand Down Expand Up @@ -798,6 +789,10 @@ public static MetadataCommentPersistence getPersistence() {
return _persistence;
}

public static void setPersistence(MetadataCommentPersistence persistence) {
_persistence = persistence;
}

private static volatile MetadataCommentPersistence _persistence;

}
3 changes: 1 addition & 2 deletions entities/entities-service/bnd.bnd
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
Bundle-Name: entities-service
Bundle-SymbolicName: de.fhg.fokus.odp.entities.service
Bundle-Version: 1.0.0
Liferay-Require-SchemaVersion: 0.0.1
Liferay-Require-SchemaVersion: 1.0.0
Liferay-Service: true
-dsannotations-options: inherit
-includeresource: META-INF/service.xml=service.xml
-liferay-service-xml: META-INF/service.xml
-plugin.metatype: com.liferay.ant.bnd.metatype.MetatypePlugin
-plugin.service: com.liferay.ant.bnd.service.ServiceAnalyzerPlugin
Bundle-Activator: de.fhg.fokus.odp.entities.activator.EntitiesServiceBundleActivator
4 changes: 2 additions & 2 deletions entities/entities-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.fhg.fokus.odp</groupId>
<artifactId>entities</artifactId>
<version>6.3.0</version>
<version>6.4.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -17,7 +17,7 @@
<plugin>
<groupId>com.liferay</groupId>
<artifactId>com.liferay.portal.tools.service.builder</artifactId>
<version>1.0.423</version>
<version>1.0.462</version>
<configuration>
<apiDirName>../entities-api/src/main/java</apiDirName>
<autoNamespaceTables>true</autoNamespaceTables>
Expand Down

This file was deleted.

Loading

0 comments on commit a191727

Please sign in to comment.