Compare commits

..

26 Commits

Author SHA1 Message Date
4ddb9aafd4 v1.1.6 pom 2022-03-03 10:17:12 -05:00
7b0963617e Merge branch 'develop' into stable 2022-03-03 10:14:57 -05:00
52010dc76e v1.1.5 pom 2021-10-27 14:34:58 -04:00
cac4c90781 Merge branch 'develop' into stable 2021-10-27 14:33:54 -04:00
117efaeedd Merge branch 'develop' into stable 2021-09-06 13:37:39 -04:00
b3275519ff v1.1.3 pom 2021-09-03 13:03:26 -04:00
3093d2bdc4 Merge branch 'develop' into stable 2021-09-03 13:02:58 -04:00
068aff951e v1.1.2 pom 2021-09-01 14:35:37 -04:00
76ac68d0e4 Merge branch 'develop' into stable 2021-08-31 22:06:11 -04:00
9e0499b243 Merge branch 'develop' into stable 2021-08-31 13:41:01 -04:00
eb0ab01355 v1.0.6-v1-acs7 pom 2021-08-28 01:09:20 -04:00
105868b5df Merge branch 'develop' into stable 2021-08-28 01:09:03 -04:00
0e8d522769 v1.0.5-v2 pom 2021-07-22 15:30:18 -04:00
7185dd225e using commons-rest-api v1.0.2 to fix jersey/put 2021-07-22 15:25:07 -04:00
1e4f420f47 v1.0.4-v2 2021-07-12 15:17:14 -04:00
64330e3ca4 Merge branch 'develop' into stable 2021-07-12 15:15:52 -04:00
8e538cfec5 v1.0.3-v2 & common v1.0.1 2021-07-07 11:08:54 -04:00
d0c1e92bce Merge branch 'develop' into stable 2021-07-07 11:08:15 -04:00
c879fa41b7 using commons version 2021-06-16 16:06:56 -04:00
10b8a4c982 v1.0.2-v2 pom 2021-06-16 16:05:52 -04:00
7dd7cc0fd4 Merge branch 'develop' into stable 2021-06-16 16:05:18 -04:00
e9ea115849 Merge branch 'develop' into stable 2021-06-04 13:32:24 -04:00
5741c77a45 v1.0.1-v2 pom 2021-06-04 12:24:29 -04:00
3bbda05066 Merge branch 'develop' into stable 2021-06-04 12:23:36 -04:00
cf1da9b6f1 Merge branch 'develop' into stable 2021-06-03 22:49:54 -04:00
1f48c3196f changed version for release 2021-06-03 21:22:20 -04:00
24 changed files with 826 additions and 426 deletions

113
pom.xml
View File

@@ -4,28 +4,34 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.inteligr8.alfresco</groupId>
<artifactId>acs-public-rest-api</artifactId>
<version>2.0-SNAPSHOT</version>
<name>Alfresco Content Services ReST API for Java</name>
<version>1.1.6</version>
<name>Alfresco Content Services ReST API Client for Java</name>
<properties>
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<maven.compiler.debuglevel>lines,vars,source</maven.compiler.debuglevel>
<!-- If you want to build for your specific version, point to your own
installation -->
<acs.baseUrl>http://localhost:8080/alfresco</acs.baseUrl>
<acs.baseUrl>https://api-explorer.alfresco.com/api-explorer</acs.baseUrl>
<acs.platform.tag>acs7</acs.platform.tag>
<swagger.basePackage>com.inteligr8.alfresco.acs</swagger.basePackage>
<jersey.version>2.35</jersey.version>
<cxf.version>3.4.7</cxf.version>
<junit.version>5.7.2</junit.version>
<spring.version>5.2.14.RELEASE</spring.version>
<jersey.version>2.34</jersey.version>
<cxf.version>3.3.2</cxf.version>
<api.model.disabled>false</api.model.disabled>
</properties>
<dependencies>
<dependency>
<groupId>com.inteligr8</groupId>
<artifactId>common-rest-api</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-jaxrs</artifactId>
@@ -38,26 +44,58 @@
</exclusions>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>2.1.6</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
<version>2.12.2</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>${cxf.version}</version>
<optional>true</optional>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-proxy-client</artifactId>
<version>${jersey.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
<version>${jersey.version}</version>
<optional>true</optional>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
<version>${cxf.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>${jersey.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<version>${jersey.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<version>${jersey.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.9</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -88,9 +126,30 @@
<classifier>${acs.platform.tag}</classifier>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0-M5</version>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.2</version>
<executions>
<execution>
<id>javadoc</id>
@@ -358,16 +417,8 @@
<repositories>
<repository>
<id>inteligr8-releases</id>
<id>inteligr8-public</id>
<url>https://repos.inteligr8.com/nexus/repository/inteligr8-public</url>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>false</enabled></snapshots>
</repository>
<repository>
<id>inteligr8-snapshots</id>
<url>https://repos.inteligr8.com/nexus/repository/inteligr8-snapshots</url>
<releases><enabled>false</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</repository>
</repositories>

View File

@@ -1,21 +1,5 @@
package com.inteligr8.alfresco.acs.api;
import java.io.File;
import java.util.Date;
import java.util.List;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.DefaultValue;
import javax.ws.rs.GET;
import javax.ws.rs.HeaderParam;
import javax.ws.rs.POST;
import javax.ws.rs.PUT;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import com.inteligr8.alfresco.acs.model.AssociationBody;
import com.inteligr8.alfresco.acs.model.AssociationEntry;
import com.inteligr8.alfresco.acs.model.ChildAssociationBody;
@@ -29,11 +13,14 @@ import com.inteligr8.alfresco.acs.model.NodeBodyMove;
import com.inteligr8.alfresco.acs.model.NodeBodyUpdate;
import com.inteligr8.alfresco.acs.model.NodeChildAssociationPaging;
import com.inteligr8.alfresco.acs.model.NodeEntry;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import java.io.File;
import java.util.Date;
import java.util.List;
import javax.ws.rs.*;
/**
* Alfresco Content Services REST API

View File

@@ -0,0 +1,165 @@
package com.inteligr8.alfresco.acs;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import com.inteligr8.rs.ClientCxfConfiguration;
import com.inteligr8.rs.ClientJerseyConfiguration;
/**
* This class provides a POJO &amp; Spring-based implementation of the
* ClientConfiguration interface. You can use it outside of the Spring
* context, but you will need the spring-context and spring-beans libraries in
* your non-Spring application.
*
* @author brian@inteligr8.com
*/
@Configuration
@ComponentScan
public class AcsClientConfiguration implements ClientCxfConfiguration, ClientJerseyConfiguration {
@Value("${content.service.baseUrl:http://localhost:8080/alfresco}")
private String baseUrl;
@Value("${content.service.security.basicAuth.username:admin}")
private String basicAuthUsername;
@Value("${content.service.security.basicAuth.password:admin}")
private String basicAuthPassword;
@Value("${content.service.security.bearerToken:#{null}}")
private String bearerToken;
@Value("${content.service.security.oauth.tokenUrl:#{null}}")
private String oAuthTokenUrl;
@Value("${content.service.security.oauth.clientId:#{null}}")
private String oAuthClientId;
@Value("${content.service.security.oauth.clientSecret:#{null}}")
private String oAuthClientSecret;
@Value("${content.service.security.oauth.authCode:#{null}}")
private String oAuthAuthCode;
@Value("${content.service.security.oauth.authRedirectUri:#{null}}")
private String oAuthAuthRedirectUri;
@Value("${content.service.security.oauth.grantUsername:#{null}}")
private String oAuthUsername;
@Value("${content.service.security.oauth.grantPassword:#{null}}")
private String oAuthPassword;
@Value("${content.service.cxf.defaultBusEnabled:true}")
private boolean defaultBusEnabled;
@Value("${content.service.jersey.putBodyRequired:true}")
private boolean putBodyRequired;
public String getBaseUrl() {
return this.baseUrl;
}
public void setBaseUrl(String baseUrl) {
this.baseUrl = baseUrl;
}
public String getBasicAuthUsername() {
return this.basicAuthUsername;
}
public void setBasicAuthUsername(String basicAuthUsername) {
this.basicAuthUsername = basicAuthUsername;
}
public String getBasicAuthPassword() {
return this.basicAuthPassword;
}
public void setBasicAuthPassword(String basicAuthPassword) {
this.basicAuthPassword = basicAuthPassword;
}
public String getBearerToken() {
return this.bearerToken;
}
public void setBearerToken(String bearerToken) {
this.bearerToken = bearerToken;
}
public String getOAuthTokenUrl() {
return this.oAuthTokenUrl;
}
public void setOAuthTokenUrl(String oAuthTokenUrl) {
this.oAuthTokenUrl = oAuthTokenUrl;
}
public String getOAuthClientId() {
return this.oAuthClientId;
}
public void setOAuthClientId(String oAuthClientId) {
this.oAuthClientId = oAuthClientId;
}
public String getOAuthClientSecret() {
return this.oAuthClientSecret;
}
public void setOAuthClientSecret(String oAuthClientSecret) {
this.oAuthClientSecret = oAuthClientSecret;
}
public String getOAuthAuthCode() {
return this.oAuthAuthCode;
}
public void setOAuthAuthCode(String oAuthAuthCode) {
this.oAuthAuthCode = oAuthAuthCode;
}
public String getOAuthAuthRedirectUri() {
return this.oAuthAuthRedirectUri;
}
public void setOAuthAuthRedirectUri(String oAuthAuthRedirectUri) {
this.oAuthAuthRedirectUri = oAuthAuthRedirectUri;
}
public String getOAuthUsername() {
return this.oAuthUsername;
}
public void setOAuthUsername(String oAuthUsername) {
this.oAuthUsername = oAuthUsername;
}
public String getOAuthPassword() {
return this.oAuthPassword;
}
public void setOAuthPassword(String oAuthPassword) {
this.oAuthPassword = oAuthPassword;
}
public boolean isDefaultBusEnabled() {
return this.defaultBusEnabled;
}
public void setDefaultBusEnabled(boolean defaultBusEnabled) {
this.defaultBusEnabled = defaultBusEnabled;
}
public boolean isPutBodyRequired() {
return this.putBodyRequired;
}
public void setPutBodyRequired(boolean putBodyRequired) {
this.putBodyRequired = putBodyRequired;
}
}

View File

@@ -0,0 +1,44 @@
package com.inteligr8.alfresco.acs;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
import com.inteligr8.rs.ClientCxfConfiguration;
import com.inteligr8.rs.ClientCxfImpl;
/**
* This class provides a POJO &amp; Spring-based implementation of the Apache
* CXF client. You can use it outside of the Spring context, but you will need
* the spring-context and spring-beans libraries in your non-Spring
* application.
*
* @author brian@inteligr8.com
*/
@Component("acs.client.cxf")
@Lazy
public class AcsClientCxfImpl extends ClientCxfImpl {
@Autowired
private AcsClientConfiguration config;
/**
* This constructor is for Spring use.
*/
protected AcsClientCxfImpl() {
}
/**
* This constructor is for POJO use.
* @param config
*/
public AcsClientCxfImpl(AcsClientConfiguration config) {
this.config = config;
}
@Override
protected ClientCxfConfiguration getConfig() {
return this.config;
}
}

View File

@@ -0,0 +1,44 @@
package com.inteligr8.alfresco.acs;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
import com.inteligr8.rs.ClientJerseyConfiguration;
import com.inteligr8.rs.ClientJerseyImpl;
/**
* This class provides a POJO &amp; Spring-based implementation of the Apache
* CXF client. You can use it outside of the Spring context, but you will need
* the spring-context and spring-beans libraries in your non-Spring
* application.
*
* @author brian@inteligr8.com
*/
@Component("acs.client.jersey")
@Lazy
public class AcsClientJerseyImpl extends ClientJerseyImpl {
@Autowired
private AcsClientConfiguration config;
/**
* This constructor is for Spring use.
*/
protected AcsClientJerseyImpl() {
}
/**
* This constructor is for POJO use.
* @param config
*/
public AcsClientJerseyImpl(AcsClientConfiguration config) {
this.config = config;
}
@Override
protected ClientJerseyConfiguration getConfig() {
return this.config;
}
}

View File

@@ -26,123 +26,236 @@ import com.inteligr8.alfresco.acs.api.TrashcanApi;
import com.inteligr8.alfresco.acs.api.TypesApi;
import com.inteligr8.alfresco.acs.api.V0Api;
import com.inteligr8.alfresco.acs.api.VersionsApi;
import com.inteligr8.rs.AuthorizationFilter;
import com.inteligr8.rs.Client;
import com.inteligr8.rs.ClientConfiguration;
/**
* This interface consolidates the JAX-RS APIs available in the ACS Public
* ReST API.
* This class serves as the base implementation for the JAX-RS API for the ACS
* Public ReST API.
*
* @author brian@inteligr8.com
*/
public interface AcsPublicRestApi {
public abstract class AcsPublicRestApi {
<T> T getApi(Class<T> apiClass);
abstract ClientConfiguration getConfig();
default ActionsApi getActionsApi() {
abstract Client getClient();
protected final <T> T getApi(Class<T> apiClass) {
return this.getApi(null, apiClass);
}
protected <T> T getApi(AuthorizationFilter authFilter, Class<T> apiClass) {
return this.getClient().getApi(authFilter, apiClass);
}
public ActionsApi getActionsApi() {
return this.getApi(ActionsApi.class);
}
default ActivitiesApi getActivitiesApi() {
public ActionsApi getActionsApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, ActionsApi.class);
}
public ActivitiesApi getActivitiesApi() {
return this.getApi(ActivitiesApi.class);
}
default AspectsApi getAspectsApi() {
return this.getApi(AspectsApi.class);
}
default AuditApi getAuditApi() {
return this.getApi(AuditApi.class);
public ActivitiesApi getActivitiesApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, ActivitiesApi.class);
}
default AuthenticationApi getAuthenticationApi() {
public AspectsApi getAspectsApi() {
return this.getApi(AspectsApi.class);
}
public AspectsApi getAspectsApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, AspectsApi.class);
}
public AuditApi getAuditApi() {
return this.getApi(AuditApi.class);
}
public AuditApi getAuditApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, AuditApi.class);
}
public AuthenticationApi getAuthenticationApi() {
return this.getApi(AuthenticationApi.class);
}
default CommentsApi getCommentsApi() {
public AuthenticationApi getAuthenticationApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, AuthenticationApi.class);
}
public CommentsApi getCommentsApi() {
return this.getApi(CommentsApi.class);
}
default DiscoveryApi getDiscoveryApi() {
public CommentsApi getCommentsApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, CommentsApi.class);
}
public DiscoveryApi getDiscoveryApi() {
return this.getApi(DiscoveryApi.class);
}
default DownloadsApi getDownloadsApi() {
public DiscoveryApi getDiscoveryApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, DiscoveryApi.class);
}
public DownloadsApi getDownloadsApi() {
return this.getApi(DownloadsApi.class);
}
default FavoritesApi getFavoritesApi() {
public DownloadsApi getDownloadsApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, DownloadsApi.class);
}
public FavoritesApi getFavoritesApi() {
return this.getApi(FavoritesApi.class);
}
default GroupsApi getGroupsApi() {
public FavoritesApi getFavoritesApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, FavoritesApi.class);
}
public GroupsApi getGroupsApi() {
return this.getApi(GroupsApi.class);
}
default NetworksApi getNetworksApi() {
public GroupsApi getGroupsApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, GroupsApi.class);
}
public NetworksApi getNetworksApi() {
return this.getApi(NetworksApi.class);
}
default NodesApi getNodesApi() {
public NetworksApi getNetworksApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, NetworksApi.class);
}
public NodesApi getNodesApi() {
return this.getApi(NodesApi.class);
}
default PeopleApi getPeopleApi() {
public NodesApi getNodesApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, NodesApi.class);
}
public PeopleApi getPeopleApi() {
return this.getApi(PeopleApi.class);
}
default PreferencesApi getPreferencesApi() {
public PeopleApi getPeopleApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, PeopleApi.class);
}
public PreferencesApi getPreferencesApi() {
return this.getApi(PreferencesApi.class);
}
default ProbesApi getProbesApi() {
public PreferencesApi getPreferencesApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, PreferencesApi.class);
}
public ProbesApi getProbesApi() {
return this.getApi(ProbesApi.class);
}
default QueriesApi getQueriesApi() {
public ProbesApi getProbesApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, ProbesApi.class);
}
public QueriesApi getQueriesApi() {
return this.getApi(QueriesApi.class);
}
default RatingsApi getRatingsApi() {
public QueriesApi getQueriesApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, QueriesApi.class);
}
public RatingsApi getRatingsApi() {
return this.getApi(RatingsApi.class);
}
default RenditionsApi getRenditionsApi() {
public RatingsApi getRatingsApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, RatingsApi.class);
}
public RenditionsApi getRenditionsApi() {
return this.getApi(RenditionsApi.class);
}
default SearchApi getSearchApi() {
public RenditionsApi getRenditionsApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, RenditionsApi.class);
}
public SearchApi getSearchApi() {
return this.getApi(SearchApi.class);
}
default SharedLinksApi getSharedLinksApi() {
public SearchApi getSearchApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, SearchApi.class);
}
public SharedLinksApi getSharedLinksApi() {
return this.getApi(SharedLinksApi.class);
}
default SitesApi getSitesApi() {
public SharedLinksApi getSharedLinksApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, SharedLinksApi.class);
}
public SitesApi getSitesApi() {
return this.getApi(SitesApi.class);
}
default TagsApi getTagsApi() {
public SitesApi getSitesApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, SitesApi.class);
}
public TagsApi getTagsApi() {
return this.getApi(TagsApi.class);
}
default TrashcanApi getTrashcanApi() {
return this.getApi(TrashcanApi.class);
public TagsApi getTagsApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, TagsApi.class);
}
default TypesApi getTypesApi() {
public TrashcanApi getTrashcanApi() {
return this.getApi(TrashcanApi.class);
}
public TrashcanApi getTrashcanApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, TrashcanApi.class);
}
public TypesApi getTypesApi() {
return this.getApi(TypesApi.class);
}
default VersionsApi getVersionsApi() {
public TypesApi getTypesApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, TypesApi.class);
}
public VersionsApi getVersionsApi() {
return this.getApi(VersionsApi.class);
}
default V0Api getV0Api() {
public VersionsApi getVersionsApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, VersionsApi.class);
}
public V0Api getV0Api() {
return this.getApi(V0Api.class);
}
default V0Api getLegacyApi() {
return this.getV0Api();
public V0Api getV0Api(AuthorizationFilter authFilter) {
return this.getApi(authFilter, V0Api.class);
}
}

View File

@@ -0,0 +1,56 @@
package com.inteligr8.alfresco.acs;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
import com.inteligr8.alfresco.acs.api.NodesCxfApi;
import com.inteligr8.rs.AuthorizationFilter;
import com.inteligr8.rs.Client;
import com.inteligr8.rs.ClientConfiguration;
/**
* This class provides the Apache CXF client to the JAX-RS API for the ACS
* Public ReST API. It also provides extension API helpers.
*
* @author brian@inteligr8.com
*/
@Component("acs.api.cxf")
@Lazy
public class AcsPublicRestApiCxfImpl extends AcsPublicRestApi {
@Autowired
private AcsClientCxfImpl client;
/**
* This constructor is for Spring use.
*/
protected AcsPublicRestApiCxfImpl() {
}
/**
* This constructor is for POJO use.
*/
public AcsPublicRestApiCxfImpl(AcsClientCxfImpl client) {
this.client = client;
}
@Override
ClientConfiguration getConfig() {
return this.client.getConfig();
}
@Override
Client getClient() {
return this.client;
}
public NodesCxfApi getNodesExtApi() {
return this.client.getApi(NodesCxfApi.class);
}
public NodesCxfApi getNodesExtApi(AuthorizationFilter authFilter) {
return this.client.getApi(authFilter, NodesCxfApi.class);
}
}

View File

@@ -0,0 +1,56 @@
package com.inteligr8.alfresco.acs;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
import com.inteligr8.alfresco.acs.api.NodesJerseyApi;
import com.inteligr8.rs.AuthorizationFilter;
import com.inteligr8.rs.Client;
import com.inteligr8.rs.ClientConfiguration;
/**
* This class provides the Jersey client to the JAX-RS API for the ACS Public
* ReST API. It also provides extension API helpers.
*
* @author brian@inteligr8.com
*/
@Component("acs.api.jersey")
@Lazy
public class AcsPublicRestApiJerseyImpl extends AcsPublicRestApi {
@Autowired
private AcsClientJerseyImpl client;
/**
* This constructor is for Spring use.
*/
protected AcsPublicRestApiJerseyImpl() {
}
/**
* This constructor is for POJO use.
*/
public AcsPublicRestApiJerseyImpl(AcsClientJerseyImpl client) {
this.client = client;
}
@Override
ClientConfiguration getConfig() {
return this.client.getConfig();
}
@Override
Client getClient() {
return this.client;
}
public NodesJerseyApi getNodesExtApi() {
return this.client.getApi(NodesJerseyApi.class);
}
public NodesJerseyApi getNodesExtApi(AuthorizationFilter authFilter) {
return this.client.getApi(authFilter, NodesJerseyApi.class);
}
}

View File

@@ -1,18 +0,0 @@
package com.inteligr8.alfresco.acs;
import com.inteligr8.alfresco.acs.api.NodesCxfApi;
/**
* This interface appends Apache CXF implementation specific methods to the
* JAX-RS API of the ACS Public ReST API. This is due to a lack of multi-part
* in the JAX-RS specification.
*
* @author brian@inteligr8.com
*/
public interface AcsPublicRestCxfApi extends AcsPublicRestApi {
default NodesCxfApi getNodesExtApi() {
return this.getApi(NodesCxfApi.class);
}
}

View File

@@ -1,18 +0,0 @@
package com.inteligr8.alfresco.acs;
import com.inteligr8.alfresco.acs.api.NodesJerseyApi;
/**
* This interface appends Jersey implementation specific methods to the
* JAX-RS API of the ACS Public ReST API. This is due to a lack of multi-part
* in the JAX-RS specification.
*
* @author brian@inteligr8.com
*/
public interface AcsPublicRestJerseyApi extends AcsPublicRestApi {
default NodesJerseyApi getNodesExtApi() {
return this.getApi(NodesJerseyApi.class);
}
}

View File

@@ -1,22 +0,0 @@
package com.inteligr8.alfresco.acs;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
public class MapUtils {
public static Map<String, String> toStringMap(Map<String, ?> map) {
if (map == null)
return null;
Map<String, String> strmap = new HashMap<>(map.size());
for (Entry<String, ?> element : map.entrySet()) {
String strvalue = element.getValue() == null ? null : element.getValue().toString();
strmap.put(element.getKey(), strvalue);
}
return strmap;
}
}

View File

@@ -1,14 +1,20 @@
package com.inteligr8.alfresco.acs.api;
import java.util.List;
import javax.ws.rs.Consumes;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import org.apache.cxf.jaxrs.ext.multipart.Attachment;
import org.apache.cxf.jaxrs.ext.multipart.Multipart;
import com.inteligr8.alfresco.acs.model.Error;
import com.inteligr8.alfresco.acs.model.NodeBodyCreateMultipartCxf;
import com.inteligr8.alfresco.acs.model.NodeBodyCreate;
import com.inteligr8.alfresco.acs.model.NodeEntry;
import io.swagger.annotations.Api;
@@ -25,7 +31,7 @@ public interface NodesCxfApi {
@Consumes({ MediaType.MULTIPART_FORM_DATA })
@Produces({ MediaType.APPLICATION_JSON })
@ApiOperation(value = "Create a node", tags={ })
@ApiResponses(value = {
@ApiResponses(value = {
@ApiResponse(code = 201, message = "Successful response", response = NodeEntry.class),
@ApiResponse(code = 400, message = "Invalid parameter: **nodeId** is not a valid format or **nodeBodyCreate** is invalid "),
@ApiResponse(code = 401, message = "Authentication failed"),
@@ -39,35 +45,12 @@ public interface NodesCxfApi {
@ApiResponse(code = 200, message = "Unexpected error", response = Error.class) })
public NodeEntry createNode(
@PathParam("nodeId") String nodeId,
NodeBodyCreateMultipartCxf body);
/*
* This better impl doesn't work
*
@POST
@Path("/nodes/{nodeId}/children")
@Consumes({ MediaType.MULTIPART_FORM_DATA })
@Produces({ MediaType.APPLICATION_JSON })
@ApiOperation(value = "Create a node", tags={ })
@ApiResponses(value = {
@ApiResponse(code = 201, message = "Successful response", response = NodeEntry.class),
@ApiResponse(code = 400, message = "Invalid parameter: **nodeId** is not a valid format or **nodeBodyCreate** is invalid "),
@ApiResponse(code = 401, message = "Authentication failed"),
@ApiResponse(code = 403, message = "Current user does not have permission to create children of **nodeId**"),
@ApiResponse(code = 404, message = "**nodeId** or **renditionId** does not exist "),
@ApiResponse(code = 409, message = "New name clashes with an existing node in the current parent folder"),
@ApiResponse(code = 413, message = "Content exceeds individual file size limit configured for the network or system"),
@ApiResponse(code = 415, message = "Content Type is not supported"),
@ApiResponse(code = 422, message = "Model integrity exception including a file name containing invalid characters"),
@ApiResponse(code = 507, message = "Content exceeds overall storage quota limit configured for the network or system"),
@ApiResponse(code = 200, message = "Unexpected error", response = Error.class) })
public NodeEntry createNode(
@PathParam("nodeId") String nodeId,
@Multipart("name") String name,
@Multipart("nodeType") String nodeType,
@Multipart("filedata") InputStream fileStream,
@Multipart("filedata") ContentDisposition disposition,
@Multipart(value = "autoRename", required = false) Boolean autoRename,
@Multipart(value = "majorVersion", required = false) Boolean majorVersion,
@Multipart(value = "versioningEnabled", required = false) Boolean versioningEnabled);
*/
@Multipart NodeBodyCreate nodeBodyCreate,
@QueryParam("autoRename") Boolean autoRename,
@QueryParam("majorVersion") Boolean majorVersion,
@QueryParam("versioningEnabled") Boolean versioningEnabled,
@QueryParam("include") List<String> include,
@QueryParam("fields") List<String> fields,
@Multipart(value = "filedata", required = false) Attachment attachment);
}

View File

@@ -1,14 +1,21 @@
package com.inteligr8.alfresco.acs.api;
import java.io.InputStream;
import java.util.List;
import javax.ws.rs.Consumes;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataParam;
import com.inteligr8.alfresco.acs.model.Error;
import com.inteligr8.alfresco.acs.model.NodeBodyCreateMultipartJersey;
import com.inteligr8.alfresco.acs.model.NodeBodyCreate;
import com.inteligr8.alfresco.acs.model.NodeEntry;
import io.swagger.annotations.Api;
@@ -39,6 +46,13 @@ public interface NodesJerseyApi {
@ApiResponse(code = 200, message = "Unexpected error", response = Error.class) })
public NodeEntry createNode(
@PathParam("nodeId") String nodeId,
NodeBodyCreateMultipartJersey file);
NodeBodyCreate nodeBodyCreate,
@QueryParam("autoRename") Boolean autoRename,
@QueryParam("majorVersion") Boolean majorVersion,
@QueryParam("versioningEnabled") Boolean versioningEnabled,
@QueryParam("include") List<String> include,
@QueryParam("fields") List<String> fields,
@FormDataParam("filedata") InputStream filedataStream,
@FormDataParam("filedata") FormDataContentDisposition filedataDisposition);
}

View File

@@ -1,98 +0,0 @@
package com.inteligr8.alfresco.acs.model;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import javax.ws.rs.core.MediaType;
import org.apache.cxf.jaxrs.ext.multipart.Attachment;
import org.apache.cxf.jaxrs.ext.multipart.ContentDisposition;
import org.apache.cxf.jaxrs.ext.multipart.MultipartBody;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.databind.ObjectMapper;
public class NodeBodyCreateMultipartCxf extends MultipartBody {
private static final Logger logger = LoggerFactory.getLogger(NodeBodyCreateMultipartCxf.class);
private static final ObjectMapper om = new ObjectMapper();
public static NodeBodyCreateMultipartCxf from(
NodeBodyCreate nodeBody, String filename, InputStream istream,
Boolean autoRename, Boolean majorVersion, Boolean versioningEnabled) throws IOException {
List<Attachment> atts = new LinkedList<>();
atts.addAll(toAttachments(nodeBody));
if (autoRename != null)
atts.add(toAttachment("autoRename", String.valueOf(autoRename)));
if (majorVersion != null)
atts.add(toAttachment("majorVersion", String.valueOf(majorVersion)));
if (versioningEnabled != null)
atts.add(toAttachment("versioningEnabled", String.valueOf(versioningEnabled)));
atts.add(toAttachment(filename, istream));
return new NodeBodyCreateMultipartCxf(atts, true);
}
public NodeBodyCreateMultipartCxf(List<Attachment> atts) throws IOException {
super(atts);
}
public NodeBodyCreateMultipartCxf(List<Attachment> atts, boolean outbound) throws IOException {
super(atts, outbound);
}
public NodeBodyCreate getBody() throws IOException {
if (!MediaType.APPLICATION_JSON_TYPE.equals(this.getRootAttachment().getContentType()))
throw new IllegalStateException();
InputStream istream = this.getRootAttachment().getDataHandler().getInputStream();
try {
return om.readValue(istream, NodeBodyCreate.class);
} finally {
istream.close();
}
}
public Attachment getFiledataAttachment() {
return this.getAttachment("filedata");
}
private static List<Attachment> toAttachments(NodeBodyCreate nodeBody) throws IOException {
List<Attachment> atts = new LinkedList<>();
atts.add(toAttachment("name", nodeBody.getName()));
atts.add(toAttachment("nodeType", nodeBody.getNodeType()));
if (nodeBody.getAspectNames() != null && !nodeBody.getAspectNames().isEmpty())
logger.warn("The ACS Public REST API does not support the explicit inclusion of aspects while creating content");
if (nodeBody.getProperties() != null) {
@SuppressWarnings("unchecked")
Map<String, Object> props = (Map<String, Object>)nodeBody.getProperties();
for (Entry<String, Object> prop : props.entrySet()) {
if (prop.getValue() != null) {
// FIXME convert dates as ACS would expect them to be formatted
atts.add(toAttachment(prop.getKey(), prop.getValue().toString()));
}
}
}
return atts;
}
private static Attachment toAttachment(String name, String value) {
return new Attachment(name, new ByteArrayInputStream(value.getBytes()), new ContentDisposition("form-data; name=\"" + name + "\""));
}
private static Attachment toAttachment(String filename, InputStream istream) {
if (filename == null) {
return new Attachment("filedata", istream, new ContentDisposition("form-data; name=\"filedata\""));
} else {
return new Attachment("filedata", istream, new ContentDisposition("form-data; name=\"filedata\"; filename=\"" + filename + "\""));
}
}
}

View File

@@ -1,95 +0,0 @@
package com.inteligr8.alfresco.acs.model;
import java.io.IOException;
import java.io.InputStream;
import java.text.ParseException;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import javax.ws.rs.core.MediaType;
import org.glassfish.jersey.media.multipart.BodyPart;
import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataMultiPart;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.databind.ObjectMapper;
public class NodeBodyCreateMultipartJersey extends FormDataMultiPart {
private static final Logger logger = LoggerFactory.getLogger(NodeBodyCreateMultipartJersey.class);
private static final ObjectMapper om = new ObjectMapper();
public static NodeBodyCreateMultipartJersey from(
NodeBodyCreate nodeBody, String filename, InputStream istream,
Boolean autoRename, Boolean majorVersion, Boolean versioningEnabled) throws IOException, ParseException {
NodeBodyCreateMultipartJersey multipart = new NodeBodyCreateMultipartJersey();
multipart.field("autoRename", String.valueOf(autoRename))
.field("majorVersion", String.valueOf(majorVersion))
.field("versioningEnabled", String.valueOf(versioningEnabled))
.bodyPart(toBodyPart(filename, istream))
.getBodyParts().addAll(toFields(nodeBody));
return multipart;
}
private NodeBodyCreateMultipartJersey() throws IOException {
}
public NodeBodyCreate getBody() throws IOException {
BodyPart bodyPart = this.getField("");
if (bodyPart == null)
throw new IllegalStateException();
if (!MediaType.APPLICATION_JSON_TYPE.equals(bodyPart.getMediaType()))
throw new IllegalStateException();
InputStream istream = bodyPart.getEntityAs(InputStream.class);
try {
return om.readValue(istream, NodeBodyCreate.class);
} finally {
istream.close();
}
}
public FormDataBodyPart getFiledataAttachment() {
return this.getField("filedata");
}
private static List<FormDataBodyPart> toFields(NodeBodyCreate nodeBody) throws IOException {
List<FormDataBodyPart> fields = new LinkedList<>();
fields.add(new FormDataBodyPart("name", nodeBody.getName()));
fields.add(new FormDataBodyPart("nodeType", nodeBody.getNodeType()));
if (nodeBody.getAspectNames() != null && !nodeBody.getAspectNames().isEmpty())
logger.warn("The ACS Public REST API does not support the explicit inclusion of aspects while creating content");
if (nodeBody.getProperties() != null) {
@SuppressWarnings("unchecked")
Map<String, Object> props = (Map<String, Object>)nodeBody.getProperties();
for (Entry<String, Object> prop : props.entrySet()) {
if (prop.getValue() != null) {
// FIXME convert dates as ACS would expect them to be formatted
fields.add(new FormDataBodyPart(prop.getKey(), prop.getValue().toString()));
}
}
}
return fields;
}
private static BodyPart toBodyPart(String filename, InputStream istream) throws ParseException {
if (filename == null) {
return new FormDataBodyPart()
.contentDisposition(new FormDataContentDisposition("form-data; name=\"filedata\""))
.entity(istream);
} else {
return new FormDataBodyPart()
.contentDisposition(new FormDataContentDisposition("form-data; name=\"filedata\"; filename=\"" + filename + "\""))
.entity(istream);
}
}
}

View File

@@ -1 +0,0 @@
org.apache.cxf.jaxrs.client.spec.ClientBuilderImpl

View File

@@ -0,0 +1,35 @@
package com.inteligr8.alfresco.acs;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.client.methods.RequestBuilder;
import org.apache.http.impl.client.DefaultRedirectStrategy;
import org.apache.http.impl.client.HttpClientBuilder;
import com.inteligr8.rs.ClientConfiguration;
public abstract class ConditionalIT {
public abstract ClientConfiguration getConfiguration();
public boolean hostExists() {
String uri = this.getConfiguration().getBaseUrl();
HttpUriRequest request = RequestBuilder.get()
.setUri(uri)
.build();
HttpClient client = HttpClientBuilder.create()
.setRedirectStrategy(DefaultRedirectStrategy.INSTANCE)
.build();
try {
HttpResponse response = client.execute(request);
return response.getStatusLine().getStatusCode() < 300;
} catch (Exception e) {
return false;
}
}
}

View File

@@ -0,0 +1,94 @@
package com.inteligr8.alfresco.acs;
import java.util.List;
import java.util.UUID;
import javax.ws.rs.NotFoundException;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIf;
import com.inteligr8.alfresco.acs.api.DiscoveryApi;
import com.inteligr8.alfresco.acs.api.NodesApi;
import com.inteligr8.alfresco.acs.api.V0Api;
import com.inteligr8.alfresco.acs.model.RepositoryInfo;
import com.inteligr8.alfresco.acs.model.v0.ClassInfo;
import com.inteligr8.alfresco.acs.model.v0.MimeTypesData;
import com.inteligr8.alfresco.acs.model.v0.PropertyInfo;
import com.inteligr8.alfresco.acs.model.v0.ServerData;
public abstract class ConnectionClientIT extends ConditionalIT {
public abstract AcsPublicRestApi getClient();
@Test
@EnabledIf("hostExists")
public void testDiscovery() {
DiscoveryApi api = this.getClient().getDiscoveryApi();
RepositoryInfo repoInfo = api.getRepositoryInformation().getEntry().getRepository();
Assertions.assertNotNull(repoInfo);
Assertions.assertFalse(repoInfo.getStatus().isIsReadOnly());
Assertions.assertEquals("6", repoInfo.getVersion().getMajor());
}
@Test
@EnabledIf("hostExists")
public void testMissingNode() {
NodesApi api = this.getClient().getNodesApi();
Assertions.assertThrows(NotFoundException.class, () -> {
api.getNode(UUID.randomUUID().toString(), null, null, null);
});
}
@Test
@EnabledIf("hostExists")
public void testV0ServerInfo() {
V0Api api = this.getClient().getV0Api();
ServerData server = api.getServer();
Assertions.assertNotNull(server);
Assertions.assertNotNull(server.getData());
Assertions.assertNotNull(server.getData().getEdition());
Assertions.assertTrue(server.getData().getEdition().length() > 5);
Assertions.assertTrue(server.getData().getVersion().length() > 5);
Assertions.assertTrue(server.getData().getSchema().length() > 3);
}
@Test
@EnabledIf("hostExists")
public void testV0MimeTypes() {
V0Api api = this.getClient().getV0Api();
MimeTypesData mimeTypes = api.getMimeTypes();
Assertions.assertNotNull(mimeTypes);
Assertions.assertNotNull(mimeTypes.getData());
Assertions.assertTrue(mimeTypes.getData().getMimeTypes().size() > 50);
Assertions.assertNotNull(mimeTypes.getData().getMimeTypeInfo("application/pdf"));
Assertions.assertEquals("pdf", mimeTypes.getData().getMimeTypeInfo("application/pdf").getExtensions().getDefault());
}
@Test
@EnabledIf("hostExists")
public void testV0Classes() {
V0Api api = this.getClient().getV0Api();
List<ClassInfo> classes = api.getClasses(null, null, null);
Assertions.assertNotNull(classes);
Assertions.assertTrue(classes.size() > 50);
}
@Test
@EnabledIf("hostExists")
public void testV0Property() {
V0Api api = this.getClient().getV0Api();
List<PropertyInfo> props = api.getProperties(null, "cm:content", null);
Assertions.assertNotNull(props);
Assertions.assertEquals(1, props.size());
Assertions.assertEquals("d:content", props.iterator().next().getDataType());
}
}

View File

@@ -0,0 +1,28 @@
package com.inteligr8.alfresco.acs;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import com.inteligr8.rs.ClientConfiguration;
@TestPropertySource(locations = {"/local.properties"})
@SpringJUnitConfig(classes = {AcsClientConfiguration.class, AcsPublicRestApiCxfImpl.class, AcsClientCxfImpl.class})
public class ConnectionCxfClientIT extends ConnectionClientIT {
@Autowired
@Qualifier("acs.api.cxf")
private AcsPublicRestApi client;
@Override
public AcsPublicRestApi getClient() {
return this.client;
}
@Override
public ClientConfiguration getConfiguration() {
return this.client.getConfig();
}
}

View File

@@ -0,0 +1,28 @@
package com.inteligr8.alfresco.acs;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import com.inteligr8.rs.ClientConfiguration;
@TestPropertySource(locations = {"/local.properties"})
@SpringJUnitConfig(classes = {AcsClientConfiguration.class, AcsPublicRestApiJerseyImpl.class, AcsClientJerseyImpl.class})
public class ConnectionJerseyClientIT extends ConnectionClientIT {
@Autowired
@Qualifier("acs.api.jersey")
private AcsPublicRestApi client;
@Override
public AcsPublicRestApi getClient() {
return this.client;
}
@Override
public ClientConfiguration getConfiguration() {
return this.client.getConfig();
}
}

View File

@@ -1 +0,0 @@
org.glassfish.jersey.client.JerseyClientBuilder

View File

@@ -0,0 +1,5 @@
content.service.baseUrl=http://localhost:8080/alfresco
content.service.security.oauth.tokenUrl=http://auth.example.org:8080/auth/realms/alfresco/protocol/openid-connect/token
content.service.security.oauth.clientId=alfresco
content.service.security.oauth.grantUsername=admin
content.service.security.oauth.grantPassword=admin

View File

@@ -0,0 +1,3 @@
content.service.baseUrl=http://localhost:8080/alfresco
content.service.security.basicAuth.username=admin
content.service.security.basicAuth.password=admin

View File

@@ -1,53 +0,0 @@
@baseUrl = http://localhost:8080/alfresco
@username = admin
@password = admin
### Find Folder
# @name find
POST {{baseUrl}}/api/-default-/public/search/versions/1/search HTTP/1.1
Authorization: Basic {{username}}:{{password}}
{
"query": {
"language": "afts",
"query": "=@cm:name:'Shared'"
}
}
@folderNodeId = {{find.response.body.list.entries[0].entry.id}}
### Upload File
# @name upload
POST {{baseUrl}}/api/-default-/public/alfresco/versions/1/nodes/{{folderNodeId}}/children?autoRename=true
Authorization: Basic {{username}}:{{password}}
Content-type: application/json
{
"name": "TestFolder",
"nodeType": "cm:content",
"properties": null
}
### Upload File
# @name upload-form
POST {{baseUrl}}/api/-default-/public/alfresco/versions/1/nodes/{{folderNodeId}}/children
Authorization: Basic {{username}}:{{password}}
Content-type: multipart/form-data; boundary=----Test
------Test
Content-disposition: form-data; name="name"
TestFolder
------Test
Content-disposition: form-data; name="nodeType"
cm:content
------Test
Content-disposition: form-data; name="autoRename"
true
------Test
Content-disposition: form-data; name="filedata"; filename="test.txt"
This is a test
------Test--